Alena Prokharchyk 972fe01aec VPC: more validation for static route rules: 1) Can't belong to guest cidr defined on Vpc 2) Can't belong to link local cidr ...

Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java

2012-08-07 11:21:53 -07:00

..

conf

License header updates for the server folder.

2012-08-03 09:41:27 -04:00

scripts

License header updates for the server folder.

2012-08-03 09:41:27 -04:00

src/com/cloud

VPC: more validation for static route rules: 1) Can't belong to guest cidr defined on Vpc 2) Can't belong to link local cidr

2012-08-07 11:21:53 -07:00

test

Merge branch 'master' into vpc

2012-08-03 14:30:54 -07:00

.classpath

License header updates for the server folder.

2012-08-03 09:41:27 -04:00

.project

License header updates for the server folder.

2012-08-03 09:41:27 -04:00