Rohit Yadav a948a89378 Sync updates: Merge branch 'master' into api_refactoring ...

Conflicts:
	server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java
	server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>

2013-01-07 10:38:43 -08:00

..

kvm

Summary: Allow for custom storage adaptors based on pool type in KVM

2012-12-17 11:41:36 -07:00

ovm

Start removing the old ant build files

2012-12-07 15:58:56 +01:00

simulator

Fix PluggableService to provide interface for ACL adapters etc. to get configs

2013-01-02 16:29:39 -08:00

vmware

Sync updates: Merge branch 'master' into api_refactoring

2013-01-07 10:38:43 -08:00

xen

CLOUDSTACK-227: Fix NPE and throw an exception if the network is not found in Xen

2012-12-23 19:03:03 -08:00