cloudstack/plugins
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
..
acl/static-role-based Spring Modularization 2013-10-02 15:41:04 -07:00
affinity-group-processors Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
alert-handlers Fixed up the pom.xml to use dependencies specified in cloudstack pom 2013-08-02 13:51:47 -07:00
api Spring Modularization 2013-10-02 15:41:04 -07:00
dedicated-resources Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
deployment-planners Spring Modularization 2013-10-02 15:41:04 -07:00
event-bus/rabbitmq Add Manage Context framework 2013-10-02 13:09:52 -07:00
file-systems/netapp Refactor missed classes 2013-10-17 16:00:11 -07:00
host-allocators/random Spring Modularization 2013-10-02 15:41:04 -07:00
hypervisors Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
network-elements Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
storage Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
storage-allocators/random Updating pom.xml version numbers for release 4.3.0-SNAPSHOT 2013-08-01 10:35:00 -04:00
user-authenticators Spring Modularization 2013-10-02 15:41:04 -07:00
pom.xml CLOUDSTACK-2328: Linux native VXLAN support on KVM hypervisor 2013-09-26 23:37:18 +09:00