Prachi Damle f84375442e Merge branch 'master' into rbac ... Conflicts: api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java server/src/com/cloud/api/ApiServer.java server/src/com/cloud/api/query/QueryManagerImpl.java server/src/com/cloud/template/TemplateAdapterBase.java setup/db/db/schema-430to440.sql tools/apidoc/gen_toc.py		2014-02-04 12:07:32 -08:00
..
cache	Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code.	2013-11-21 07:56:47 -08:00
datamotion	CLOUDSTACK-5813: With S3 as secondary storage, snapshot taken in one	2014-01-08 17:15:04 -08:00
image	Merge branch 'master' into rbac	2014-02-04 12:07:32 -08:00
integration-test	Removed all reminants of the IdentityService. Created the KeysManager to move the management	2014-01-14 13:11:35 -08:00
resources/META-INF/cloudstack	fix compile	2013-11-01 16:16:03 -07:00
snapshot	Merge branch 'master' into rbac.	2014-01-17 14:37:08 -08:00
src/org/apache/cloudstack/storage	Merge branch 'master' into rbac	2014-01-22 11:23:51 -08:00
test/org/apache/cloudstack/engine/subsystem/api/storage	Reformatted all of the code.	2013-11-21 06:15:26 -08:00
volume	Merge branch 'master' into rbac	2014-02-04 12:07:32 -08: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