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
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
..
acl api: Fix APIAccessChecker and StaticRoleBasedAPIAccessChecker 2012-12-11 14:10:36 -08:00
agent/api Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
alert commit ba3fef5d0650c42463d0f225f4ca14b5f9046c44 2012-12-17 17:44:39 -08:00
api Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
async api: Use Identity interface instead of java reflect to getId 2012-12-21 19:05:45 -08:00
capacity api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
cluster committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
configuration api: move and group all under command, org.apache.cloudstack.command.* 2012-12-07 18:30:54 -08:00
consoleproxy committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
dao api: Fix findByXId to findByUuid in EntityManager and ApiDispatcher 2012-12-18 17:44:17 -08:00
dc Remove IdentityProxy from Response classes. 2012-12-18 23:16:38 -08:00
deploy api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
domain Conflicts: 2012-12-17 15:41:56 -08:00
event api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
exception Remove IdentityProxy from CloudException and ExceptionResponse. 2012-12-19 23:49:44 -08:00
host Conflicts: 2012-12-17 15:41:56 -08:00
hypervisor Remove IdentityProxy from OfferingResponse, FirewallResponse, 2012-12-18 12:02:08 -08:00
network Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
offering Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
org Conflicts: 2012-12-17 15:41:56 -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
serializer api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
server Create DB views to improve ListHostsCmd performance. 2012-12-22 21:47:05 -08:00
storage Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
template Remove IdentityProxy from Response classes. 2012-12-18 16:33:12 -08:00
user commit ba3fef5d0650c42463d0f225f4ca14b5f9046c44 2012-12-17 17:44:39 -08:00
uservm committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
vm Move view based VO and Dao classes to cloud-server module to hide the 2012-12-14 10:47:58 -08:00