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
..
log4j.xml	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