Min Chen 99bdc8d875 Merge branch 'master' into rbac.		2014-03-13 11:05:03 -07:00
..
cache	CLOUDSTACK-6049: Give priority to cache stores where data object is	2014-02-06 17:19:24 -08:00
datamotion	CLOUDSTACK-6170	2014-03-05 13:55:12 -07:00
image	CLOUDSTACK-6204: removing realhostip dependency	2014-03-09 13:46:57 -07:00
integration-test	CLOUDSTACK-6170	2014-03-05 13:55:12 -07:00
resources/META-INF/cloudstack	fix compile	2013-11-01 16:16:03 -07:00
snapshot	Renaming AclEntityType --> IAMEntityType	2014-02-25 16:43:17 -08:00
src/org/apache/cloudstack/storage	CLOUDSTACK-5920:Add interface to ControlledEntity to return IAM	2014-03-05 09:40:55 -08:00
test/org/apache/cloudstack/engine/subsystem/api/storage	Reformatted all of the code.	2013-11-21 06:15:26 -08:00
volume	CLOUDSTACK-6170	2014-03-05 13:55:12 -07:00
pom.xml	Bump 4.3.0 to 4.4.0 in master	2013-11-21 16:01:15 +01:00
storage.ucls	Don't use cast to PrimarydataStoreTO on the resource code	2013-11-01 15:13:16 -07:00