Sheng Yang f37b089fce Revert "Removing baremetal related references" ... This reverts commit 99ea4011b1. Conflicts: server/src/com/cloud/network/NetworkServiceImpl.java		2013-06-21 09:46:56 -07:00
..
conf	conf: Add a @ so @MSUSER@ is replaced by "cloud"	2013-04-03 16:54:00 +02: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	Revert "Removing baremetal related references"	2013-06-21 09:46:56 -07:00
test	merge object_store	2013-06-20 00:18:00 -07:00
pom.xml	test and cleanup for getBase64Keystore	2013-05-31 11:26:33 +05:30