Merge branch 'testing' into next

This commit is contained in:
Dan Mick 2012-12-05 18:18:41 -08:00
commit 3e98d1af4d
2 changed files with 12 additions and 6 deletions

View File

@ -150,10 +150,13 @@ Commands
snapshots, this fails and nothing is deleted.
:command:`export` [*image-name*] [*dest-path*]
Exports image to dest path.
Exports image to dest path (use - for stdout).
:command:`import` [*path*] [*dest-image*]
Creates a new image and imports its data from path.
Creates a new image and imports its data from path (use - for
stdin). The import operation will try to create sparse rbd images
if possible. For import from stdin, the sparsification unit is
the data block size of the destination image (1 << order).
:command:`cp` [*src-image*] [*dest-image*]
Copies the content of a src-image into the newly created dest-image.

View File

@ -1,4 +1,4 @@
.TH "RBD" "8" "October 22, 2012" "dev" "Ceph"
.TH "RBD" "8" "December 05, 2012" "dev" "Ceph"
.SH NAME
rbd \- manage rados block device (RBD) images
.
@ -179,10 +179,13 @@ Deletes an rbd image (including all data blocks). If the image has
snapshots, this fails and nothing is deleted.
.TP
.B \fBexport\fP [\fIimage\-name\fP] [\fIdest\-path\fP]
Exports image to dest path.
Exports image to dest path (use \- for stdout).
.TP
.B \fBimport\fP [\fIpath\fP] [\fIdest\-image\fP]
Creates a new image and imports its data from path.
Creates a new image and imports its data from path (use \- for
stdin). The import operation will try to create sparse rbd images
if possible. For import from stdin, the sparsification unit is
the data block size of the destination image (1 << order).
.TP
.B \fBcp\fP [\fIsrc\-image\fP] [\fIdest\-image\fP]
Copies the content of a src\-image into the newly created dest\-image.
@ -440,6 +443,6 @@ the Ceph documentation at \fI\%http://ceph.com/docs\fP for more information.
\fBceph\fP(8),
\fBrados\fP(8)
.SH COPYRIGHT
2012, Inktank Storage, Inc.
2010-2012, Inktank Storage, Inc. and contributors. Licensed under Creative Commons BY-SA
.\" Generated by docutils manpage writer.
.