Alena Prokharchyk d38e9eebed VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules ...

Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java

2012-08-07 11:25:02 -07:00

..

conf

License header updates for the server folder.

2012-08-03 09:41:27 -04:00

scripts

License header updates for the server folder.

2012-08-03 09:41:27 -04:00

src/com/cloud

VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules

2012-08-07 11:25:02 -07:00

test

VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules

2012-08-07 11:25:02 -07:00

.classpath

License header updates for the server folder.

2012-08-03 09:41:27 -04:00

.project

License header updates for the server folder.

2012-08-03 09:41:27 -04:00