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
Rohit Yadav 38eaa04b98 Pull changes from master into javelin 
- Disables simulator plugin, breaks build, available via simulator profile
- Fixes spring injections
- Fix api,acl plugins, ApiServer, ApiDispatcher
- Fix other merge conflicts

Conflicts:
	docs/en-US/external-firewalls-and-load-balancers.xml
	plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 		2013-01-12 06:02:54 -08:00
..
as api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
element Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
firewall api: move and group all under command, org.apache.cloudstack.command.* 2012-12-07 18:30:54 -08:00
guru api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
lb api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
router Support for adding private network 2012-06-15 14:20:34 -07:00
rules api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
security api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
vpc api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
vpn api: Refactor and move VPN related api cmd classes to command.user.vpn 2012-12-22 16:13:37 -08:00
IpAddress.java api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
Network.java api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
NetworkProfile.java api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
NetworkService.java NetworkService: Add method to interface to get network by uuid 2013-01-11 18:44:20 -08:00
Networks.java api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
PhysicalNetwork.java api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
PhysicalNetworkServiceProvider.java Enforce InternalIdentity interface on all VO classes that impls long getId() 2012-12-26 15:09:44 -08:00
PhysicalNetworkSetupInfo.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
PhysicalNetworkTrafficType.java api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
PublicIpAddress.java api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
RemoteAccessVpn.java api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08: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 api: move and group all under command, org.apache.cloudstack.command.* 2012-12-07 18:30:54 -08:00
VirtualNetworkApplianceService.java api: move and group all under command, org.apache.cloudstack.command.* 2012-12-07 18:30:54 -08:00
VirtualRouterProvider.java api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08: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