cloudstack/server/src/com/cloud/network
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
..
addr Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00
dao S2S VPN: CS-15748: Deleting customer vpn gateway when delete account 2012-07-30 15:34:41 -07:00
element VPC: 2012-07-27 13:55:39 -07:00
firewall VPC: moved vpc related code from NetworkManager to VpcManager 2012-08-01 18:45:06 -07:00
guru Merge branch 'master' into vpc 2012-07-23 10:36:25 -07:00
lb VPC: moved vpc related code from NetworkManager to VpcManager 2012-08-01 18:45:06 -07:00
router VPC: moved vpc related code from NetworkManager to VpcManager 2012-08-01 18:45:06 -07:00
rules VPC: moved vpc related code from NetworkManager to VpcManager 2012-08-01 18:45:06 -07:00
security Resource tags: CS-15647 - delete resource tags when SG is expunged 2012-07-23 10:33:59 -07:00
vpc VPC: moved vpc related code from NetworkManager to VpcManager 2012-08-01 18:45:06 -07:00
vpn Build fix. 2012-08-01 16:41:38 -07:00
ExteralIpAddressAllocator.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ExternalFirewallDeviceManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ExternalFirewallDeviceManagerImpl.java Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00
ExternalFirewallDeviceVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ExternalLoadBalancerDeviceManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ExternalLoadBalancerDeviceManagerImpl.java Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00
ExternalLoadBalancerDeviceVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ExternalLoadBalancerUsageManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ExternalLoadBalancerUsageManagerImpl.java VPC: CS-15519 - fixed ipAssoc when only zoneId parameter is passed in to the API call 2012-07-10 15:20:39 -07:00
ExternalNetworkDeviceManager.java Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
ExternalNetworkDeviceManagerImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
FirewallRulesCidrsVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
IPAddressVO.java Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00
InlineLoadBalancerNicMapVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
IpAddrAllocator.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
LBStickinessPolicyVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
LoadBalancerVMMapVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
LoadBalancerVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkAccountDaoImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkAccountVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkDomainVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkExternalFirewallVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkExternalLoadBalancerVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkManager.java VPC: moved vpc related code from NetworkManager to VpcManager 2012-08-01 18:45:06 -07:00
NetworkManagerImpl.java VPC: moved vpc related code from NetworkManager to VpcManager 2012-08-01 18:45:06 -07:00
NetworkRuleConfigVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkServiceMapVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkUsageManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkUsageManagerImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NetworkVO.java Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00
PhysicalNetworkVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
PortProfileManagerImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
PortProfileVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
RemoteAccessVpnVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
RouterNetworkDaoImpl.java Fixed license headers 2012-07-18 14:52:13 -07:00
RouterNetworkVO.java Fixed license headers 2012-07-18 14:52:13 -07:00
Site2SiteCustomerGatewayVO.java S2S VPN: CS-15724: Show more parameter for listVpnCustomerGateways API 2012-07-30 15:52:23 -07:00
Site2SiteVpnConnectionVO.java S2S VPN: Add list function for normal users 2012-07-27 16:27:36 -07:00
Site2SiteVpnGatewayVO.java S2S VPN: Use source NAT ip address for VPN gateway 2012-07-23 14:44:05 -07:00
SshKeysDistriMonitor.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
StorageNetworkManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
StorageNetworkManagerImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00