etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/client/tomcatconf
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
..
catalina.policy.in Source code committed 2010-08-11 09:13:29 -07:00
catalina.properties.in Source code committed 2010-08-11 09:13:29 -07:00
cisconexusvsm_commands.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
classpath.conf.in License header update for the client folder 2012-08-01 13:49:10 -04:00
cloudmanagementserver.keystore Bug 9479 - provide option for built in https 2011-09-01 16:01:28 -07:00
commands-ext.properties.in commands-ext.properties.in: remove duplication, same in commands.properties.in 2012-12-05 14:40:45 -08:00
commands.properties.in Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
components-cloudzones.xml.in License header update for the client folder 2012-08-01 13:49:10 -04:00
components-nonoss.xml.in jetty:run should use ${project.build.directory}/${project.build.finalName} directory 2012-10-11 12:08:28 -07:00
components.xml.in api: Add ACL adapter for components.xml 2012-12-10 17:27:11 -08:00
context.xml.in Source code committed 2010-08-11 09:13:29 -07:00
db-enc.properties.in removed some unused database connection properties 2012-12-13 22:46:29 -08:00
db.properties.in removed some unused database connection properties 2012-12-13 22:46:29 -08:00
ehcache.xml.in License header update for the client folder 2012-08-01 13:49:10 -04:00
environment.properties.in Rename cloud-agent-scripts to cloud-scripts 2012-09-13 16:29:01 +02:00
f5bigip_commands.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
junipersrx_commands.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
log4j-cloud.xml.in Create DB views to improve ListHostsCmd performance. 2012-12-22 21:47:05 -08:00
logging.properties.in Source code committed 2010-08-11 09:13:29 -07:00
netapp_commands.properties.in CLOUDSTACK-50 build-apidocs ClassNotFoundException: com.cloud.api.commands.DeleteCiscoNexusVSMCmd 2012-09-08 10:56:32 +08:00
netscalerloadbalancer_commands.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
nicira-nvp_commands.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
server-nonssl.xml.in api: Enable UTF-8 URI encoding for tomcat 2012-12-17 20:43:37 -08:00
server-ssl.xml.in api: Enable UTF-8 URI encoding for tomcat 2012-12-17 20:43:37 -08:00
server.xml.in api: Enable UTF-8 URI encoding for tomcat 2012-12-17 20:43:37 -08:00
simulator.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
tomcat-users.xml.in Source code committed 2010-08-11 09:13:29 -07:00
tomcat6-nonssl.conf.in License header update for the client folder 2012-08-01 13:49:10 -04:00
tomcat6-ssl.conf.in License header update for the client folder 2012-08-01 13:49:10 -04:00
virtualrouter_commands.properties.in api: move and group all under command, org.apache.cloudstack.command.* 2012-12-07 18:30:54 -08:00
web.xml.in Source code committed 2010-08-11 09:13:29 -07:00