etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/plugins/hypervisors/simulator/src/com/cloud
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
..
agent/manager Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
api/commands CLOUDSTACK-4285: configure simulator API not discovered 2013-08-13 18:04:08 +05:30
resource CLOUDSTACK-4649: 2013-10-22 17:54:51 -07:00
simulator Refactor missed classes 2013-10-17 16:00:11 -07:00