cloudstack/server
Alena Prokharchyk 7cceaae912 VPC: moved vpc related code from NetworkManager to VpcManager
Conflicts:

	api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-01 18:45:06 -07:00
..
conf fixing line endings in server 2012-04-07 20:13:10 -04:00
scripts Source code committed 2010-08-11 09:13:29 -07:00
src/com/cloud VPC: moved vpc related code from NetworkManager to VpcManager 2012-08-01 18:45:06 -07:00
test VPC: moved vpc related code from NetworkManager to VpcManager 2012-08-01 18:45:06 -07:00
.classpath bug 6745: Using UUID instead of integers - for System VM s 2011-11-03 07:33:57 -07:00
.project Fix corrupted eclipse project settings, schema fixes and updated template download url 2010-09-29 18:41:54 -07:00