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
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
..
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 Summary: adding resizeVolume api call 2013-01-16 17:43:35 -07: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 network-refactor-merge2 2013-01-16 19:17:14 -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
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