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
..
WEB-INF	Add Dutch (Netherlands, Polish languages in Web UI Change Japanese code (ja -> ja_JP) Update transifex sync config	2014-01-17 11:15:09 +00:00
bindir	Summary: update packaging	2013-02-05 10:47:42 +01:00
distro	init: Explicitly set the HOME variable to the homedir of the user cloud	2013-01-09 13:11:21 +01:00
resources/META-INF/cloudstack	Spring Modularization	2013-10-02 15:41:04 -07:00
tomcatconf	Merge branch 'master' into rbac	2014-02-04 12:07:32 -08:00
pom.xml	Merge branch 'master' into rbac.	2014-01-17 14:37:08 -08:00