cloudstack/client
Prachi Damle fb18223933 Merge branch 'master' into planner_reserve
Conflicts:
	api/src/com/cloud/event/EventTypes.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
	server/test/resources/affinityContext.xml
	setup/db/db/schema-410to420.sql
2013-05-08 17:02:35 -07:00
..
WEB-INF VM wizard: Show message if no affinity groups are available. 2013-04-30 13:30:40 -07: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
tomcatconf Merge branch 'master' into planner_reserve 2013-05-08 17:02:35 -07:00
pom.xml Recent pom switcharoo caused the client to lose the dependecy on console-proxy, which it needs to include the systemvm 2013-05-07 09:58:16 +02:00