Murali Reddy c838f3abb8 fix scripts that handle setting up bridge for tunnel network and for ... distributed routing. Fix ensures there is approproate flag in other config of the network to indicate the bridge type. Conflicts: server/src/com/cloud/network/vpc/VpcManagerImpl.java		2014-03-20 16:30:07 +05:30
..
conf	Summary: Updated sudoers approved commands for cloud user	2013-10-23 13:42:16 -07:00
resources	Merge branch 'master' into rbac.	2014-03-13 11:05:03 -07:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	fix scripts that handle setting up bridge for tunnel network and for	2014-03-20 16:30:07 +05:30
test	CLOUDSTACK-6205: VPC VR start - skip private gateway when create Guest nics as the nic for the private gateway is being created separately	2014-03-14 11:57:58 -07:00
pom.xml	Update master to 4.5.0-SNAPSHOT	2014-03-14 14:55:26 +01:00