etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/utils
History
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
..
bindir fixing utils license header 2012-06-06 23:06:02 -04:00
certs Update fail-safe keystore with RSA private key 2011-07-25 18:55:16 -07:00
conf Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
src Merge branch 'master' into portablepublicip 2013-05-11 23:32:13 +05:30
test Removing ^M's from code. 2013-04-04 00:53:20 +05:30
pom.xml Fixed an incorrect unit test for affinity group. Removed some useless pom.xml. 2013-05-06 16:34:26 -07:00