Chiradeep Vittal cadca5fc0c Merge branch 'master' into network-refactor-merge2 ... Conflicts: api/src/com/cloud/network/NetworkService.java api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java server/src/com/cloud/acl/DomainChecker.java server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java server/src/com/cloud/network/NetworkManager.java server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java server/test/com/cloud/network/MockNetworkManagerImpl.java server/test/com/cloud/vpc/MockNetworkManagerImpl.java		2013-01-16 19:17:14 -08:00
..
BareMetalElement.java	CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup	2012-10-17 17:26:19 -07:00
CloudZonesNetworkElement.java	Network-refactor: Refactor NetworkManager into NetworkModel and NetworkManager.	2013-01-09 15:49:01 -08:00
ExternalDhcpElement.java	CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup	2012-10-17 17:26:19 -07:00
SecurityGroupElement.java	CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup	2012-10-17 17:26:19 -07:00
VirtualRouterElement.java	Merge branch 'master' into network-refactor-merge2	2013-01-16 19:17:14 -08:00
VirtualRouterProviderVO.java	api: Entities will extend InternalIdentity and Identity	2012-12-26 19:11:15 -08:00
VpcVirtualRouterElement.java	Network-refactor: fix bugs in components.xml discovered by unit tests	2013-01-09 15:49:02 -08:00