Alena Prokharchyk 818a3c72ac VPC: CS-15485 - dont' create a record for VPC VR private gateway nic in router_network_ref; do it for regular guest networks only ...

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java

2012-07-06 14:57:26 -07:00

..

conf

fixing line endings in server

2012-04-07 20:13:10 -04:00

scripts

…

src/com/cloud

VPC: CS-15485 - dont' create a record for VPC VR private gateway nic in router_network_ref; do it for regular guest networks only

2012-07-06 14:57:26 -07:00

test

Merge branch 'master' into vpc

2012-07-06 12:04:10 -07:00

.classpath

bug 6745: Using UUID instead of integers - for System VM s

2011-11-03 07:33:57 -07:00

.project

…