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
..
console-proxy	Fixed check style error	2014-01-23 10:54:09 +05:30
console-proxy-rdp/rdpconsole	Fix mock socket client/server test.	2014-01-30 21:11:56 +09:00
iam	Add access for domain wide createAffinityGroup	2014-02-03 18:14:56 -08:00
secondary-storage	Fix findbugs findings and remove dead code	2014-01-31 09:37:16 +01:00
pom.xml	Merge branch 'master' into rbac.	2014-01-17 14:37:08 -08:00