mirror of https://github.com/apache/cloudstack.git
This reverts commit ea9e1b5d138950e8de49fce7ffdbb12a1c72c560. Conflicts: api/src/com/cloud/api/ResponseGenerator.java scripts/vm/hypervisor/xenserver/vmops server/src/com/cloud/configuration/Config.java server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java |
||
|---|---|---|
| .. | ||
| catalina.policy.in | ||
| catalina.properties.in | ||
| classpath.conf.in | ||
| commands.properties.in | ||
| components.xml.in | ||
| context.xml.in | ||
| db.properties.in | ||
| ehcache.xml.in | ||
| environment.properties.in | ||
| log4j-cloud.xml.in | ||
| logging.properties.in | ||
| server.xml.in | ||
| tomcat-users.xml.in | ||
| tomcat6.conf.in | ||
| web.xml.in | ||