SrikanteswaraRao Talluri d22adf943d Merge branch 'marvin' ... Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> Conflicts: test/integration/component/test_dynamic_compute_offering.py test/integration/smoke/test_deploy_vm.py test/integration/smoke/test_disk_offerings.py test/integration/smoke/test_volumes.py		2014-04-23 11:45:43 +05:30
..
resources/META-INF/cloudstack	Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package	2014-01-21 17:19:52 -08:00
src	CLOUDSTACK-6199: Revert the AsyncVm and AsyncVolume Cmd. There is a better way to check the display property of first class entities.	2014-04-18 13:58:13 -07:00
test	Merge branch 'master' into marvin	2014-04-08 17:53:37 +05:30
findbugsExcludeFilter.xml	findbugs: exclude known spiffy hacks a.k.a. false positives	2014-03-28 14:28:10 +01:00
pom.xml	Update master to 4.5.0-SNAPSHOT	2014-03-14 14:55:26 +01:00