etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/api/src/com/cloud/network
History
Alena Prokharchyk 1cff609347 Merge branch 'master' into internallb1 
Conflicts:
	server/src/com/cloud/network/NetworkModelImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
 		2013-05-03 12:50:59 -07:00
..
as fixed unit tests from merge 2013-01-18 15:58:55 -08:00
element Give some more details on what is expected of an IpDeployer. 2013-04-19 16:37:22 +02:00
firewall Merge latest master into javelin 2013-01-31 11:34:49 -08:00
guru api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
lb Internal Lb: 2013-04-10 16:28:26 -07:00
router Internal LB: intermediate checkin - added InternalLBAppliance manager and managerImpl 2013-04-10 16:29:57 -07:00
rules Merge branch 'master' into internallb1 2013-05-03 12:50:59 -07:00
security CLOUDSTACK-24: mipn feature for basiczone 2013-03-13 10:24:22 +05:30
vpc CLOUDSTACK-1828 Source Nat on private gateway feature 2013-05-02 15:40:15 +05:30
vpn CLOUDSTACK-240: added id/uuid fields to remote_access_vpn table and corresponding VO/Dao objects. The DB upgrade is covered as well. Now tags can be created for the VPN object 2013-03-29 10:40:28 -07:00
IpAddress.java Merge branch 'master' into internallb1 2013-04-17 15:51:05 -07:00
Network.java Merge branch 'master' into internallb1 2013-04-16 09:55:45 -07:00
NetworkModel.java Merge branch 'master' into internallb1 2013-04-29 16:12:10 -07:00
NetworkProfile.java CLOUDSTACK-705 IP Address reservation for Isolated Guest Networks 2013-02-22 15:50:33 +05:30
NetworkService.java CLOUDSTACK-1828 Source Nat on private gateway feature 2013-05-02 15:40:15 +05:30
NetworkUsageService.java CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl 2013-02-05 16:49:34 +05:30
Networks.java MidoNet Networking Plugin 2013-04-03 12:03:11 +02:00
PhysicalNetwork.java Cloudstack-701 Support for non contiguous vlan ranges. 2013-04-17 10:14:42 +05:30
PhysicalNetworkServiceProvider.java fixed unit tests from merge 2013-01-18 15:58:55 -08:00
PhysicalNetworkSetupInfo.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
PhysicalNetworkTrafficType.java fixed unit tests from merge 2013-01-18 15:58:55 -08:00
PublicIpAddress.java Removed set() methods from IpAddress related interfaces 2013-04-17 15:11:38 -07:00
RemoteAccessVpn.java CLOUDSTACK-240: added id/uuid fields to remote_access_vpn table and corresponding VO/Dao objects. The DB upgrade is covered as well. Now tags can be created for the VPN object 2013-03-29 10:40:28 -07:00
Site2SiteCustomerGateway.java api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
Site2SiteVpnConnection.java api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
Site2SiteVpnGateway.java api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
StorageNetworkService.java fixed unit tests from merge 2013-01-18 15:58:55 -08:00
TrafficLabel.java CLOUDSTACK-657 VMware vNetwork Distributed Virtual Switch support in CloudStack 2013-02-27 18:37:14 +05:30
VirtualNetworkApplianceService.java InternalLbVm: support for start/stop Internal lb vm 2013-04-15 11:36:52 -07:00
VirtualRouterProvider.java InternalLB: Modified pluggable service VirtualRouterElementService to accept only VirtualRouter and VpcVirtualRouter as a VirtualRouterProvider type when add/configure elements. Other VirtualRouterProviderTypes are are taken care by elb/internal lb plugins. 2013-04-10 16:29:18 -07:00
VpcVirtualNetworkApplianceService.java api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
VpnUser.java api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00