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
..
conf	Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format	2013-07-26 20:35:49 -07:00
resources/com/cloud/upgrade	CLOUDSTACK-1818: add a missing file that is missed in previous patch	2013-03-29 11:12:36 -07:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	Merge remote-tracking branch 'origin/txn-refactor'	2013-10-23 10:40:44 -07:00
test	Merge remote-tracking branch 'origin/txn-refactor'	2013-10-23 10:40:44 -07:00
pom.xml	Fix wome warning due to conflicting xml libraries	2013-10-21 09:45:31 +01:00