Frank 6c819c1491 Merge branch 'bareMetal' ... Conflicts: api/src/com/cloud/api/ApiConstants.java api/src/com/cloud/api/commands/DeployVMCmd.java api/src/com/cloud/offering/ServiceOffering.java api/src/com/cloud/vm/UserVmService.java client/tomcatconf/components.xml.in server/src/com/cloud/agent/manager/AgentManagerImpl.java server/src/com/cloud/configuration/DefaultComponentLibrary.java server/src/com/cloud/deploy/FirstFitPlanner.java server/src/com/cloud/service/ServiceOfferingVO.java server/src/com/cloud/vm/UserVmManagerImpl.java server/src/com/cloud/vm/VirtualMachineManagerImpl.java		2011-03-08 14:18:11 -08:00
..
element	Changed restartNetwork command flow:	2011-01-24 18:37:57 -08:00
guru	Release vnet during network shutdown for guest networks only	2011-02-23 18:50:23 -08:00
lb	bug 8564: Changed implementation for static nat rules. Now we use separate interfaces instead of PortForwardingRules interfaces.	2011-02-15 10:45:28 -08:00
ovs	ovs tunnel network -- add lock entry in ovs_tunnel_account	2011-01-24 13:47:34 -08:00
router	started vms with these latest	2011-02-11 17:03:04 -08:00
rules	bug 8753: never release public Ip address without ensuring that all corresponding resources (PF/StaticNat/Lb rules) are cleaned up.	2011-02-28 09:21:05 -08:00
security	bug 8637: throw ResourceAllocationException when resource limit is exceeded.	2011-02-18 12:26:58 -08:00
vpn	Sync on network instead of ipAddressId when do create PF/StaticNat/LB rules	2011-02-17 16:13:28 -08:00
IpAddress.java	bug 8251: introduced "id" field for public IP address. In the DB id is a primary key in user_ip_address table; ip_address and source_network_id is a composite key	2011-02-01 12:16:18 -08:00
Network.java	Merge branch 'bareMetal'	2011-03-08 14:18:11 -08:00
NetworkProfile.java	Release vnet during network shutdown for guest networks only	2011-02-23 18:50:23 -08:00
NetworkService.java	bug 8146: Multiple network case (default network is Virtual) - for Direct networks dhcp servers set dns to the eth0 ip address of the domR belonging to virtualNetwork	2011-03-07 19:56:25 -08:00
Networks.java	bug 8617: Disable firewall/lb/vpn service for Direct network offering, so when user tries to create PF/LB rule for direct IP address, it fails.	2011-02-17 14:31:05 -08:00
PublicIpAddress.java	remote access vpn, user ip address changes	2010-12-29 09:32:54 -08:00
RemoteAccessVpn.java	bug 8251: introduced "id" field for public IP address. In the DB id is a primary key in user_ip_address table; ip_address and source_network_id is a composite key	2011-02-01 12:16:18 -08:00
VirtualNetworkApplianceService.java	added forced paramter to stop apis	2011-02-08 15:38:26 -08:00
VpnUser.java	remote access vpn, user ip address changes	2010-12-29 09:32:54 -08:00