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

..

agent

Removed obsolete file SearchCriteria2Test.java which caused ant unittest

2012-08-02 10:33:06 -07:00

async

Patch from Chip Childers

2012-07-02 09:51:21 -04:00

cluster

Patch from Chip Childers

2012-07-02 09:51:21 -04:00

keystore

Patch from Chip Childers

2012-07-02 09:51:21 -04:00

network

VPC: unittest preparation

2012-08-07 11:23:52 -07:00

snapshot

Patch from Chip Childers

2012-07-02 09:51:21 -04:00

storage/dao

Patch from Chip Childers

2012-07-02 09:51:21 -04:00

upgrade

Patch from Chip Childers

2012-07-02 09:51:21 -04:00

user

Fixed broken unittest

2012-07-24 10:30:39 -07:00

utils/db

Patch from Chip Childers

2012-07-02 09:51:21 -04:00

vm

Merge branch 'master' into vpc

2012-07-31 13:37:28 -07:00

vpc

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