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
Rohit Yadav 296b49c2f8 Merge branch 'master' into test-merge-api 
Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 		2012-12-23 13:54:46 -08:00
..
account Patch from Chip Childers 2012-07-02 09:51:21 -04:00
acl api: Fix APIAccessChecker and StaticRoleBasedAPIAccessChecker 2012-12-11 14:10:36 -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 test-merge-api 2012-12-23 13:54:46 -08:00
async api: Refactor command and response classes to org.apache.cloudstack.api.* 2012-12-07 19:23:24 -08:00
baremetal Remove IdentityProxy from plugin response classes. 2012-12-19 13:09:02 -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 HttpClient needs releaseConnection method call 2012-11-29 20:23:30 +01:00
configuration Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
consoleproxy api_refactor: refactor vpn and vm apis 2012-12-03 21:27:02 -08:00
dao api: Fix findByXId to findByUuid in EntityManager and ApiDispatcher 2012-12-18 17:44:17 -08:00
dc Add back Identity interface to most VO class to avoid cast error in 2012-12-22 22:35:09 -08:00
deploy refactor: remove redundant imports, fix trailing chars 2012-12-03 13:54:37 -08:00
domain Add back Identity interface to most VO class to avoid cast error in 2012-12-22 22:35:09 -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 HA worker thread needs to have its own worker thread configuration 2012-08-17 12:59:52 -07:00
host/dao api_refactoring: Fix build issues and incorrect imports 2012-12-06 13:48:20 -08:00
hypervisor add apidocs/devcloud projects 2012-10-21 00:01:47 -07:00
keystore Patch from Chip Childers 2012-07-02 09:51:21 -04:00
maint HttpClient needs releaseConnection method call 2012-11-29 20:23:30 +01:00
migration Remove IdentityProxy from AutoScale responses. 2012-12-18 11:19:36 -08:00
network Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
offerings Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
projects Move view based VO and Dao classes to cloud-server module to hide the 2012-12-14 10:47:58 -08:00
resource Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
resourcelimit Name change for vpc/Dao package (dao is lowercased now) 2012-08-08 14:51:51 -07:00
secstorage Patch from Chip Childers 2012-07-02 09:51:21 -04:00
server Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
service Patch from Chip Childers 2012-07-02 09:51:21 -04:00
servlet api_refactor: refactor vpn and vm apis 2012-12-03 21:27:02 -08:00
storage Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
tags Move view based VO and Dao classes to cloud-server module to hide the 2012-12-14 10:47:58 -08:00
template Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
test Fixed CLOUDSTACK-287 2012-10-09 09:37:27 -07:00
upgrade Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
usage Patch from Chip Childers 2012-07-02 09:51:21 -04:00
user Move view based VO and Dao classes to cloud-server module to hide the 2012-12-14 10:47:58 -08:00
uuididentity api_refactor: refactor vpn and vm apis 2012-12-03 21:27:02 -08:00
vm Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00