cloudstack

mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00

History

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

cluster

Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package

2014-01-21 17:19:52 -08:00

config

Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package

2014-01-21 17:19:52 -08:00

Merge branch 'master' into rbac

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

events

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