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
..
bindir	fixing utils license header	2012-06-06 23:06:02 -04:00
certs	Update fail-safe keystore with RSA private key	2011-07-25 18:55:16 -07:00
conf	License header updates for the utils folder	2012-08-03 14:15:09 -04:00
src	S2S VPN: CS-15511: Add PFS support for VPN connection	2012-08-06 15:27:13 -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 utils folder	2012-08-03 14:15:09 -04:00
.project	License header updates for the utils folder	2012-08-03 14:15:09 -04:00
LICENSE	bug 9697: encode api response values	2011-06-10 18:10:44 -07:00