shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Merge remote-tracking branch 'upstream/feature-1112' into feature-1112

Browse Source
This commit is contained in:
Hector Sanjuan 2012-03-07 15:21:03 +01:00
commit 75a19e8bb7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/etc/oned.conf
View File

@ -80,9 +80,9 @@ MAC_PREFIX = "02:00"
#*******************************************************************************
# DataStore Configuration
#*******************************************************************************
# DATASTORE_LOCATION: Path for Datastores in the hosts. It IS the same all the
# hosts in the cluster. DATASTORE_LOCATION IS ONLY FOR THE HOSTS AND *NOT* THE
# FRONT-END. It defaults to /var/lib/one/datastores (or
# DATASTORE_LOCATION: Path for Datastores in the hosts. It IS the same for all
# the hosts in the cluster. DATASTORE_LOCATION IS ONLY FOR THE HOSTS AND *NOT*
# THE FRONT-END. It defaults to /var/lib/one/datastores (or
# $ONE_LOCATION/var/datastores in self-contained mode)
#
# DEFAULT_IMAGE_TYPE: This can take values

2
src/tm/TransferManagerDriver.cc
View File

@ -142,7 +142,7 @@ void TransferManagerDriver::protocol(
getline(is,info);
os.str("");
os << "Error excuting image transfer script";
os << "Error executing image transfer script";
if (!info.empty() && info[0] != '-')
{