etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/engine
History
Murali Reddy a718d353f7 Merge branch 'master' into portablepublicip 
Conflicts:
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/addr/PublicIp.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/db/schema-410to420.sql
 		2013-05-13 21:22:19 +05:30
..
api merge master 2013-05-11 15:28:43 +05:30
components-api Removing ^M's from code. 2013-04-04 00:53:20 +05:30
compute CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 2013-02-20 16:42:56 +05:30
network CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 2013-02-20 16:42:56 +05:30
orchestration CLOUDSTACK-2096 Deployment Planner - Deployment planner is not looking for hosts in other clusters when vm is being started. 2013-04-19 17:55:37 -07:00
planning/src/org/apache/cloudstack/platform/planning Added engine 2012-11-05 09:14:14 -08:00
schema Merge branch 'master' into portablepublicip 2013-05-13 21:22:19 +05:30
service CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 2013-02-20 16:42:56 +05:30
storage merge with master 2013-05-13 17:30:42 +05:30
pom.xml merge master 2013-05-11 15:28:43 +05:30