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
..
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:06 -07:00
conf	fixing line ends in utils	2012-04-09 20:05:41 -04:00
src	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
test	CS-15513: Fix group 5 of s2s vpn	2012-07-10 10:38:17 -07:00
.classpath	new log4j	2011-06-21 10:15:21 -07:00
.project	Source code committed	2010-08-11 09:13:29 -07:00
LICENSE	bug 9697: encode api response values	2011-06-10 18:10:44 -07:00