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
..
conf	fixing line endings in server	2012-04-07 20:13:10 -04:00
scripts	…
src/com/cloud	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	Merge branch 'master' into vpc	2012-07-13 13:52:58 -07:00
.classpath	bug 6745: Using UUID instead of integers - for System VM s	2011-11-03 07:33:57 -07:00
.project	…