cloudstack/client
Murali Reddy f82c6a8431 Merge branch 'master' into portablepublicip
Conflicts:
	api/src/com/cloud/network/IpAddress.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java
	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
	setup/db/db/schema-410to420.sql
2013-05-11 23:32:13 +05:30
..
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 portablepublicip 2013-05-11 23:32:13 +05:30
pom.xml CLOUDSTACK-747: Internal LB between VPC tiers support 2013-05-09 11:54:41 -07:00