etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/src/com/cloud
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
..
account Patch from Chip Childers 2012-07-02 09:51:21 -04:00
acl Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
agent Remove IdentityProxy from CloudException and ExceptionResponse. 2012-12-19 23:49:44 -08:00
alert refactor: remove redundant imports, fix trailing chars 2012-12-03 13:54:37 -08:00
api Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
async Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
baremetal Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
capacity CS 16158: Load Test - Adding host takes much longer in 3.0.x compared to 2.2.14. 2012-08-31 13:40:18 -07:00
certificate/dao Patch from Chip Childers 2012-07-02 09:51:21 -04:00
cluster api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
configuration Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
consoleproxy Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
dao api: Fix findByXId to findByUuid in EntityManager and ApiDispatcher 2012-12-18 17:44:17 -08:00
dc api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
deploy refactor: remove redundant imports, fix trailing chars 2012-12-03 13:54:37 -08:00
domain api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
event Move view based VO and Dao classes to cloud-server module to hide the 2012-12-14 10:47:58 -08:00
ha Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
host/dao api_refactoring: Fix build issues and incorrect imports 2012-12-06 13:48:20 -08:00
hypervisor Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
keystore Enforce InternalIdentity interface on all VO classes that impls long getId() 2012-12-26 15:09:44 -08:00
maint Enforce InternalIdentity interface on all VO classes that impls long getId() 2012-12-26 15:09:44 -08:00
migration Enforce InternalIdentity interface on all VO classes that impls long getId() 2012-12-26 15:09:44 -08:00
network Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
offerings reverting the earlier commit 432ea9c7d4 2013-01-16 15:10:27 +05:30
projects api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
resource Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
resourcelimit api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
secstorage Enforce InternalIdentity interface on all VO classes that impls long getId() 2012-12-26 15:09:44 -08:00
server reverting the earlier commit 432ea9c7d4 2013-01-16 15:10:27 +05:30
service Patch from Chip Childers 2012-07-02 09:51:21 -04:00
servlet server: Fix ApiServer init method, we won't use cfg files and it's not used there 2013-01-09 17:20:46 -08:00
storage Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
tags api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
template api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
test Fixed CLOUDSTACK-287 2012-10-09 09:37:27 -07:00
upgrade reverting the earlier commit 432ea9c7d4 2013-01-16 15:10:27 +05:30
usage CLOUDSTACK-212: Move api response classes to cloud-api under org.apache.cloudstack 2013-01-05 16:27:36 -08:00
user DomainService: Fix getDomain by uuid string 2013-01-11 18:44:19 -08:00
uuididentity server: Get rid of db helpers that work with IdentityMapper 2012-12-23 18:04:32 -08:00
vm Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00