Alena Prokharchyk a78fcedb5e VPC: added vpcId to SetStaticNatRule and CreateLoadBalancerConfig commands ... Conflicts: server/src/com/cloud/network/element/NetscalerElement.java		2012-06-28 10:13:19 -07:00
..
conf	fixing line endings in server	2012-04-07 20:13:10 -04:00
scripts	…
src/com/cloud	VPC: added vpcId to SetStaticNatRule and CreateLoadBalancerConfig commands	2012-06-28 10:13:19 -07:00
test	VPC: update ip address object after the ip is associated with the network	2012-06-25 21:00:12 -07:00
.classpath	bug 6745: Using UUID instead of integers - for System VM s	2011-11-03 07:33:57 -07:00
.project	…