alena d3eb9db7fa bug 11204: when search for domR/dhcp, include Role to the corresponding search to eliminate getting "LB" network element in the response ... status 11204: resolved fixed Conflicts: server/src/com/cloud/network/element/VirtualRouterElement.java server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java		2011-08-23 12:05:53 -07:00
..
element	bug 10561: intermediate checkin for enable/disableStaticNat.	2011-08-11 10:19:22 -07:00
firewall	Merge branch '2.2.y'	2011-08-22 20:28:30 -07:00
guru	bug 11043: Propagating fix	2011-08-11 10:30:03 -07:00
lb	Merge branch '2.2.y'	2011-08-22 20:28:30 -07:00
ovs	Add license header to files	2011-04-14 11:23:14 -07:00
router	bug 11204: when search for domR/dhcp, include Role to the corresponding search to eliminate getting "LB" network element in the response	2011-08-23 12:05:53 -07:00
rules	Merge branch '2.2.y'	2011-08-22 20:28:30 -07:00
security	bug 1067:	2011-08-19 11:10:16 +05:30
vpn	bug 10561: intermidiate checkin for FirewallRuleFeature	2011-08-09 15:51:56 -07: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 '2.2.y'	2011-08-22 20:28:30 -07:00
NetworkProfile.java	Revert "bug 10373: Intermediate checkin for Domain level guest Virtual networks"	2011-07-21 16:04:55 -07:00
NetworkService.java	Revert "bug 10373: Intermediate checkin for Domain level guest Virtual networks"	2011-07-21 16:04:55 -07:00
Networks.java	Add license header to files	2011-04-14 11:23:14 -07:00
PublicIpAddress.java	remote access vpn, user ip address changes	2010-12-29 09:32:54 -08:00
RemoteAccessVpn.java	Revert "bug 10435: removed vpn feature"	2011-08-02 18:12:57 -07:00
VirtualNetworkApplianceService.java	bug 8144: Added event for router start/stop and reboot	2011-06-15 12:40:23 +05:30
VpnUser.java	Revert "bug 10435: removed vpn feature"	2011-08-02 18:12:57 -07:00