Alena Prokharchyk ce876e24de VPC: intermidiate checkin to Static Routes ... Conflicts: api/src/com/cloud/api/ApiConstants.java		2012-06-25 21:00:57 -07:00
..
catalina.policy.in	…
catalina.properties.in	…
cisconexusvsm_commands.properties.in	CS-9919: Support for Nexus Swiches (Cisco Vswitches)	2012-05-25 18:27:29 -07:00
classpath.conf.in	…
cloudmanagementserver.keystore	…
commands-ext.properties.in	more line ending fixes	2012-04-06 22:51:32 -04:00
commands.properties.in	VPC: intermidiate checkin to Static Routes	2012-06-25 21:00:57 -07:00
components-cloudzones.xml.in	…
components.xml.in	Support for adding private network	2012-06-15 14:20:34 -07:00
context.xml.in	…
db.properties.in	merge awsapi build script changes to master	2012-05-25 14:40:56 -07:00
ehcache.xml.in	…
environment.properties.in	more line ending fixes	2012-04-06 22:51:32 -04:00
f5bigip_commands.properties.in	CS-14751	2012-05-15 12:48:20 -07:00
junipersrx_commands.properties.in	CS-14751	2012-05-15 12:48:20 -07:00
log4j-cloud.xml.in	merge awsapi build script changes to master	2012-05-25 14:40:56 -07:00
logging.properties.in	…
netscalerloadbalancer_commands.properties.in	CS-14751	2012-05-15 12:48:20 -07:00
server-nonssl.xml	merge awsapi build script changes to master	2012-05-25 14:40:56 -07:00
server-ssl.xml.in	merge awsapi build script changes to master	2012-05-25 14:40:56 -07:00
server.xml.in	merge awsapi build script changes to master	2012-05-25 14:40:56 -07:00
simulator.properties.in	…
tomcat-users.xml.in	…
tomcat6-nonssl.conf.in	…
tomcat6-ssl.conf.in	Bug 9479 - provide option for built in https	2011-09-02 11:00:04 -07:00
virtualrouter_commands.properties.in	more line ending fixes	2012-04-06 22:51:32 -04:00
web.xml.in	…