etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/plugins/hypervisors
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
..
baremetal Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
kvm Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
ovm Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
simulator Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
ucs Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
vmware Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
xen Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00