etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/api
History
Alena Prokharchyk 7b24a7640c Merge branch 'master' into internallb1 
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	setup/db/db/schema-410to420.sql
 		2013-04-29 16:12:10 -07:00
..
src Merge branch 'master' into internallb1 2013-04-29 16:12:10 -07:00
test CLOUDSTACK-1741 Added ip uuid into the AddIptoVmNicCmd response 2013-04-25 15:16:26 +05:30
pom.xml CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 2013-02-20 16:42:56 +05:30