cloudstack/server
Alena Prokharchyk 183633cf70 VPC: createPrivateGateway - consists of plug nic + ipassoc (no setsource nat is needed)
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-02 17:44:54 -07:00
..
conf fixing line endings in server 2012-04-07 20:13:10 -04:00
scripts
src/com/cloud VPC: createPrivateGateway - consists of plug nic + ipassoc (no setsource nat is needed) 2012-07-02 17:44:54 -07:00
test VPC: createPrivateGateway - consists of plug nic + ipassoc (no setsource nat is needed) 2012-07-02 17:44:54 -07:00
.classpath bug 6745: Using UUID instead of integers - for System VM s 2011-11-03 07:33:57 -07:00
.project