Alena Prokharchyk 119e4e7443 VPC: CS-15681 - execute VPC related methods only when router is a vpc router ... Conflicts: server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java		2012-07-24 16:12:13 -07:00
..
conf	fixing line endings in server	2012-04-07 20:13:10 -04:00
scripts	…
src/com/cloud	VPC: CS-15681 - execute VPC related methods only when router is a vpc router	2012-07-24 16:12:13 -07:00
test	VPC: when VPC router gets destroyed and recreated, plug public nic for each Vlan where VPC public ips belong to	2012-07-20 17:12:34 -07:00
.classpath	bug 6745: Using UUID instead of integers - for System VM s	2011-11-03 07:33:57 -07:00
.project	…