etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/engine/schema/src/com/cloud
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
..
alert merge master 2013-05-11 15:28:43 +05:30
capacity merge master 2013-05-11 15:28:43 +05:30
certificate merge master 2013-05-11 15:28:43 +05:30
cluster merge master 2013-05-11 15:28:43 +05:30
configuration merge master 2013-05-11 15:28:43 +05:30
dc CLOUDSTACK-702: Multiple ip ranges in different subnets. 2013-05-13 17:06:44 +05:30
domain merge master 2013-05-11 15:28:43 +05:30
event merge master 2013-05-11 15:28:43 +05:30
host merge master 2013-05-11 15:28:43 +05:30
hypervisor merge master 2013-05-11 15:28:43 +05:30
keystore merge master 2013-05-11 15:28:43 +05:30
migration merge master 2013-05-11 15:28:43 +05:30
network Merge branch 'master' into portablepublicip 2013-05-13 21:22:19 +05:30
offerings merge master 2013-05-11 15:28:43 +05:30
projects merge master 2013-05-11 15:28:43 +05:30
secstorage merge master 2013-05-11 15:28:43 +05:30
service merge master 2013-05-11 15:28:43 +05:30
storage merge master 2013-05-11 15:28:43 +05:30
tags merge master 2013-05-11 15:28:43 +05:30
upgrade merge with master 2013-05-13 16:36:41 +05:30
usage merge master 2013-05-11 15:28:43 +05:30
user merge master 2013-05-11 15:28:43 +05:30
vm merge with master 2013-05-13 17:30:42 +05:30