Hugo Trippaers 5b2e1f42b7 The adapterlist needs to be merged instead of overwritten in ...

ComponentLocator.

When using the extend option in the components-nonoss.xml the adapter
lsit was overwritten (putAll on the map), but it should be merged
instead. This prevented adapters from the parent to be loaded.

2012-10-22 11:13:34 +02:00

..

bindir

fixing utils license header

2012-06-06 23:06:02 -04:00

certs

Update fail-safe keystore with RSA private key

2011-07-25 18:55:16 -07:00

conf

if db.properties.override missing, shouldn't panic

2012-10-10 16:20:35 -07:00

src/com/cloud/utils

The adapterlist needs to be merged instead of overwritten in

2012-10-22 11:13:34 +02:00

test

bug CS-16034 getRandomIp can return -1 unexpectedly

2012-08-16 11:42:25 -07:00

pom.xml

Merge some stuff from maven-waf branch into master

2012-10-01 15:04:08 -07:00