cloudstack/plugins/hypervisors/baremetal
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
..
resources/security_group_agent Fix new url for centos pkging and baremetal python pkg 2013-03-26 11:27:18 +05:30
src Merge remote-tracking branch 'origin/txn-refactor' 2013-10-23 10:40:44 -07:00
pom.xml Updating pom.xml version numbers for release 4.3.0-SNAPSHOT 2013-08-01 10:35:00 -04:00