Alena Prokharchyk ad80f426a0 VPC: CS-15553 and CS-15549 - more checks during automatic ip assoc to VPC network ...

Conflicts:

	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java

2012-07-13 13:32:14 -07:00

..

src/com/cloud

VPC: CS-15553 and CS-15549 - more checks during automatic ip assoc to VPC network

2012-07-13 13:32:14 -07:00

.classpath

Use exports for jar dependecy

2011-02-01 11:10:37 -08:00

.project

Source code committed

2010-08-11 09:13:29 -07:00