etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/src/com/cloud/resource
History
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
..
DiscovererBase.java Revert "Reverting the range of commits that broke the build" 2013-08-08 15:02:40 -07:00
DummyHostDiscoverer.java Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
DummyHostServerResource.java Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
ResourceManagerImpl.java Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00