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
..
default	CLOUDSTACK-3994: fix for Wrong error notification is generated when Primary storage is added with wrong path	2013-10-17 13:21:58 +05:30
sample	Updating pom.xml version numbers for release 4.3.0-SNAPSHOT	2013-08-01 10:35:00 -04:00
solidfire	New Transaction API	2013-10-16 09:21:00 -07:00