etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/plugins
History
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
..
acl/static-role-based StaticRoleBased: commands.properties is actually cfg for this plugin 2013-01-14 19:01:26 -08:00
api/discovery ApiDiscovery: Use UserContext getCallerUser, do a lazy eval to get account service 2013-01-15 16:11:51 -08:00
deployment-planners Start removing the old ant build files 2012-12-07 15:58:56 +01:00
file-systems/netapp netapp: Fix String conversion method of long id 2013-01-09 11:22:35 -08:00
host-allocators/random Start removing the old ant build files 2012-12-07 15:58:56 +01:00
hypervisors Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
network-elements Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
storage-allocators/random Start removing the old ant build files 2012-12-07 15:58:56 +01:00
user-authenticators Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
pom.xml ApiDiscovery: New plugin to help discover apis on mgmt server 2013-01-08 18:54:29 -08:00