etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/src/com/cloud/network
History
Alena Prokharchyk 3ada5e4a46 VPC: CS-16100 - 1) when start VPC router, never pick up any other hypervisor besides vmWare and Xen 2) When start user vm in vpc network, throw an error when deploy from the tempalate of not supported hypervisor 
Reviewed-by: Frank Zhang

Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 		2012-08-22 11:53:59 -07:00
..
addr Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00
dao S2S VPN: Fix license headers 2012-08-17 16:52:06 -07:00
element Merge branch 'master' into vpc 2012-08-08 11:50:39 -07:00
firewall VPC: CS-15968 - don't send ips in Releasing state to the router when the nic is already unplugged for this Vlan 2012-08-13 11:55:34 -07:00
guru Fixed regression in GuestNetworkGuru - get networkId from the network object passed to the method call instead of retrieving it from tne NicProfile when it wasn't set yet 2012-08-17 09:43:34 -07:00
lb VPC: CS-15968 - don't send ips in Releasing state to the router when the nic is already unplugged for this Vlan 2012-08-13 11:55:34 -07:00
router VPC: CS-16100 - 1) when start VPC router, never pick up any other hypervisor besides vmWare and Xen 2) When start user vm in vpc network, throw an error when deploy from the tempalate of not supported hypervisor 2012-08-22 11:53:59 -07:00
rules VPC: CS-15968 - don't send ips in Releasing state to the router when the nic is already unplugged for this Vlan 2012-08-13 11:55:34 -07:00
security Resource tags: CS-15647 - delete resource tags when SG is expunged 2012-07-23 10:33:59 -07:00
vpc VPC: CS-16100 - 1) when start VPC router, never pick up any other hypervisor besides vmWare and Xen 2) When start user vm in vpc network, throw an error when deploy from the tempalate of not supported hypervisor 2012-08-22 11:53:59 -07:00
vpn S2S VPN: Fix license headers 2012-08-17 16:52:06 -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 Submit Midokura SDN controller stubs 2012-08-13 18:55:11 +05:30
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 CS-15304: VR deployment - release the lock for the network once the router entry is allocated (2.2.x behavior) as opposed to releasing it when the router start is completed 2012-08-21 15:31:07 -07:00
NetworkManagerImpl.java [ASFCS40]Db upgrade: merging changes from 303->304 upgrade to 3.0.2 -> 4.0 on master branch. 2012-08-21 16:27:54 -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 VPC: more unittests for VpcService 2012-08-07 11:37:36 -07:00
PhysicalNetworkVO.java [ASFCS40]Db upgrade: merging changes from 303->304 upgrade to 3.0.2 -> 4.0 on master branch. 2012-08-21 16:27:54 -07:00
PortProfileManagerImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
PortProfileVO.java Merge branch 'master' into vpc 2012-08-03 14:30:54 -07:00
RemoteAccessVpnVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
RouterNetworkVO.java Fixed license headers 2012-07-18 14:52:13 -07:00
Site2SiteCustomerGatewayVO.java S2S VPN: Fix license headers 2012-08-17 16:52:06 -07:00
Site2SiteVpnConnectionVO.java S2S VPN: Fix license headers 2012-08-17 16:52:06 -07:00
Site2SiteVpnGatewayVO.java S2S VPN: Fix license headers 2012-08-17 16:52:06 -07:00
SshKeysDistriMonitor.java VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr 2012-08-03 14:23:45 -07: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