etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/engine
History
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
..
api License header was missed in StrategyPriority and Test 2013-10-15 10:59:28 +05:30
components-api CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled 2013-10-22 12:44:23 +02:00
network Updating pom.xml version numbers for release 4.3.0-SNAPSHOT 2013-08-01 10:35:00 -04:00
orchestration Merge remote-tracking branch 'origin/txn-refactor' 2013-10-23 10:40:44 -07:00
schema Merge remote-tracking branch 'origin/txn-refactor' 2013-10-23 10:40:44 -07:00
service Fix a few xml wellformedness issues 2013-09-21 14:58:56 +08:00
storage Merge remote-tracking branch 'origin/txn-refactor' 2013-10-23 10:40:44 -07:00
pom.xml the cloud-engine-storage-integration-test sub-project should not depend 2013-09-02 14:32:25 +02:00