Darren Shepherd e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization' ... Conflicts: client/tomcatconf/applicationContext.xml.in client/tomcatconf/nonossComponentContext.xml.in client/tomcatconf/simulatorComponentContext.xml.in framework/db/src/com/cloud/utils/db/Transaction.java plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java server/src/com/cloud/api/ApiServer.java server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java		2013-10-23 11:14:42 -07:00
..
cloud-agent.rc	packaging: Do not depend on JNA and don't include it in the classpath	2013-09-29 12:22:46 +02:00
cloud-ipallocator.rc	CLOUDSTACK-1651 - point agent scripts to correct logging location, due to move	2013-03-12 12:20:22 -06:00
cloud-management.rc	CLOUDSTACK-3583: Fix for Management server stop is not removing the PID	2013-10-22 16:20:51 +05:30
cloud-management.sysconfig	Summary: update packaging	2013-02-05 10:47:42 +01:00
cloud-usage.rc	CLOUDSTACK-2033 Fix usage server startup and logging	2013-04-16 10:52:49 +02:00
cloud.spec	Merge remote-tracking branch 'origin/spring-modularization'	2013-10-23 11:14:42 -07:00
cloudstack-agent.te	CLOUDSTACK-337 - first iteration of an agent SELinux policy	2013-03-16 13:26:24 -04:00
cloudstack-sccs	follow up fix for CLOUDSTACK-1049	2013-10-22 15:53:55 -07:00
package.sh	Update usage to avoid confusion.	2013-09-21 12:36:15 +08:00
replace.properties	CLOUDSTACK-2033 Fix usage server startup and logging	2013-04-16 10:52:49 +02:00