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/network
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
..
as merge master 2013-05-11 15:28:43 +05:30
dao Merge branch 'master' into portablepublicip 2013-05-13 21:22:19 +05:30
element merge master 2013-05-11 15:28:43 +05:30
rules merge master 2013-05-11 15:28:43 +05:30
security merge master 2013-05-11 15:28:43 +05:30
vpc CLOUDSTACK-768: ACL on private gateway 2013-05-13 19:24:23 +05:30
LBHealthCheckPolicyVO.java merge master 2013-05-11 15:28:43 +05:30
UserIpv6AddressVO.java merge master 2013-05-11 15:28:43 +05:30
VpnUserVO.java merge master 2013-05-11 15:28:43 +05:30