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 356866c72b Merge branch 'master' into javelin 
- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 		2013-01-24 19:18:53 -08:00
..
applicationContext.xml.in Fix issues with @DB support in Spring environment 2013-01-15 12:35:03 -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
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.properties.in Merge branch 'master' into api_limit 2013-01-16 22:48:22 -08:00
componentContext.xml.in Merge branch 'master' into javelin 2013-01-24 19:18:53 -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 Merge branch 'master' into api_limit 2013-01-17 21:23:50 -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 db.properties: adding other key value info for dbcreator to work in a generic way 2013-01-18 17:19:55 -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
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
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
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
web.xml.in Source code committed 2010-08-11 09:13:29 -07:00