cloudstack/server/test
Alena Prokharchyk 21519070fc VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManager.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-09 18:23:35 -07:00
..
com/cloud VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to 2012-07-09 18:23:35 -07:00
resources Switch to Apache license 2012-04-03 04:50:05 -07:00
async-job-component.xml fixing line endings in server 2012-04-07 20:13:10 -04:00
sync-queue-component.xml fixing line endings in server 2012-04-07 20:13:10 -04:00