Darren Shepherd 205a77a5bb Merge remote-tracking branch 'origin/txn-refactor' ...

Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java

2013-10-23 10:40:44 -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/txn-refactor'

2013-10-23 10:40:44 -07:00

test

Add unit tests for Transaction

2013-10-17 16:07:11 -07:00

pom.xml

Fix wome warning due to conflicting xml libraries

2013-10-21 09:45:31 +01:00