Alena Prokharchyk 71ead9ef4e VPC: CS-15925 - when vpc provider is speficied for a new network offering, no other providers can be used ... Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/vpc/VpcManagerImpl.java server/test/com/cloud/network/MockNetworkManagerImpl.java		2012-08-13 14:03:39 -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: CS-15925 - when vpc provider is speficied for a new network offering, no other providers can be used	2012-08-13 14:03:39 -07:00
projects	fix unittest SecurityGroupManagerImpl2Test	2012-08-10 16:01:43 +08: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	Merge branch 'master' into vpc	2012-08-10 10:47:49 -07:00
utils/db	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
vm	VPC: more unittests for VpcService	2012-08-07 11:37:36 -07:00
vpc	VPC: CS-15925 - when vpc provider is speficied for a new network offering, no other providers can be used	2012-08-13 14:03:39 -07:00