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

..

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

Merge branch 'master' into rbac

2014-02-04 12:07:32 -08:00

test

Merge branch 'master' into rbac.

2014-01-17 14:37:08 -08:00

pom.xml

Bump 4.3.0 to 4.4.0 in master

2013-11-21 16:01:15 +01:00