Edison Su 24d1f161b8 CLOUDSTACK-5329: fix NPE, in case of zone wide primary storage ... Conflicts: api/src/com/cloud/storage/StoragePool.java server/src/com/cloud/vm/UserVmManagerImpl.java		2014-03-27 17:38:38 -07:00
..
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-5329: fix NPE, in case of zone wide primary storage	2014-03-27 17:38:38 -07:00
test	Merge branch 'master' into rbac.	2014-03-13 11:05:03 -07:00
pom.xml	Bump 4.3.0 to 4.4.0 in master	2013-11-21 16:01:15 +01:00