Alena Prokharchyk 4a7149e6b5 VPC: CS-15580 - don't allow gateway for VPC guest network to be equal to the cidr subnet ... Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/vpc/VpcManagerImpl.java		2012-07-13 17:09:16 -07:00
..
account	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
acl	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
agent	CS-15560 : Improve HVM logging of hosts	2012-07-13 10:51:56 -07:00
alert	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
api	VPC: added State to vpc_gateways	2012-07-11 12:05:42 -07:00
async	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
baremetal	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
capacity	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
certificate/dao	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
configuration	Merge branch 'master' into vpc	2012-07-03 17:32:50 -07:00
consoleproxy	Merge branch 'master' into vpc	2012-07-13 13:52:58 -07:00
dao	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
dc	Merge branch 'master' into vpc	2012-07-06 12:04:10 -07:00
deploy	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
domain	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
event	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
ha	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
host/dao	Phase 1 of Nicira integration	2012-07-11 17:16:06 -07:00
hypervisor	Merge branch 'master' into vpc	2012-07-13 13:52:58 -07:00
keystore	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
maint	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
migration	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
network	VPC: CS-15580 - don't allow gateway for VPC guest network to be equal to the cidr subnet	2012-07-13 17:09:16 -07:00
offerings	Merge branch 'master' into vpc	2012-07-03 17:32:50 -07:00
projects	Merge branch 'master' into vpc	2012-07-06 12:04:10 -07:00
resource	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
resourcelimit	CS-15300: Domain Admin accounts now respect the limits imposed on the domain just as a regular account.	2012-07-03 04:35:53 +05:30
secstorage	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
server	Merge branch 'master' into vpc	2012-07-13 13:52:58 -07:00
service	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
servlet	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
storage	Merge branch 'master' into vpc	2012-07-13 13:52:58 -07:00
tags	CS-15459: fixed listTags by resourceType	2012-07-11 12:08:34 -07:00
template	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
test	Merge branch 'master' into vpc	2012-07-03 17:32:50 -07:00
upgrade	Removed @author tag from bunch of resources	2012-07-06 17:25:36 -07:00
usage	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
user	Merge branch 'master' into vpc	2012-07-03 17:32:50 -07:00
uuididentity	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
vm	Merge branch 'master' into vpc	2012-07-13 13:52:58 -07:00