etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/utils
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
..
bindir fixing utils license header 2012-06-06 23:06:02 -04:00
certs Update fail-safe keystore with RSA private key 2011-07-25 18:55:16 -07:00
conf reverting a local change 2013-07-18 16:22:08 +05:30
src Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
test Add unit tests for Transaction 2013-10-17 16:07:11 -07:00
pom.xml Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00