shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-22 17:57:46 +03:00
Code Releases Wiki Activity

Feature #1617: Minor edits, typos

Browse Source
This commit is contained in:
Carlos Martín 2012-12-05 16:48:56 +01:00
parent 1433a0780a
commit bf8c8c4d68
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/Datastore.h
View File

@ -40,7 +40,7 @@ public:
};
/**
* Return the string representation of an DatastoreType
* Return the string representation of a DatastoreType
* @param ob the type
* @return the string
*/
@ -56,9 +56,9 @@ public:
};
/**
* Return the string representation of an DatastoreType
* Return the string representation of a DatastoreType
* @param str_type string representing the DatastoreTypr
* @return the ImageType (defaults to IMAGE_DS)
* @return the DatastoreType (defaults to IMAGE_DS)
*/
static DatastoreType str_to_type(string& str_type);

6
include/Image.h
View File

@ -38,9 +38,9 @@ public:
OS = 0, /** < Base OS image */
CDROM = 1, /** < An ISO9660 image */
DATABLOCK = 2, /** < User persistent data device */
KERNEL = 3, /** < Context, kernels and initrd files */
RAMDISK = 4, /** < Context, kernels and initrd files */
CONTEXT = 5 /** < Context, kernels and initrd files */
KERNEL = 3, /** < Kernel files */
RAMDISK = 4, /** < Initrd files */
CONTEXT = 5 /** < Context files */
};
/**

2
src/image/ImagePool.cc
View File

@ -212,7 +212,7 @@ error_types_missmatch_file:
error_types_missmatch_image:
oss << "IMAGES of type KERNEL, RAMDISK and CONTEXT cannot be registered"
" in a IMAGE_DS datastore";
" in an IMAGE_DS datastore";
goto error_common;
error_duplicated:

2
src/rm/RequestManagerImage.cc
View File

@ -270,7 +270,7 @@ void ImageClone::request_execute(
case Image::CONTEXT:
failure_response(ACTION,
allocate_error("KERNEL, RAMDISK and CONTEXT files cannot be "
"clonned."), att);
"cloned."), att);
img->unlock();
return;
}

2
src/rm/RequestManagerVirtualMachine.cc
View File

@ -652,7 +652,7 @@ void VirtualMachineSaveDisk::request_execute(xmlrpc_c::paramList const& paramLis
case Image::RAMDISK:
case Image::CONTEXT:
failure_response(INTERNAL,
request_error("Cannot save_as image of type FILE", ""),
request_error("Cannot save_as image of type " + Image::type_to_str(type), ""),
att);
return;
}