diff options
| author | Dan Mick <dan.mick@inktank.com> | 2012-12-05 18:18:41 -0800 |
|---|---|---|
| committer | Dan Mick <dan.mick@inktank.com> | 2012-12-05 18:18:41 -0800 |
| commit | 3e98d1af4d72efbe96e8b2ea2b38f9d299ab95d9 (patch) | |
| tree | 7175f0bc09de5f75d9a11fd96f4f376a99bc0a21 | |
| parent | a55700cc0aea0ff79e55c6bf78e9757b81fe9425 (diff) | |
| parent | b7b724299ecb56aa6efa5094b3ebd27c37ed5ce6 (diff) | |
| download | ceph-3e98d1af4d72efbe96e8b2ea2b38f9d299ab95d9.tar.gz | |
Merge branch 'testing' into next
| -rw-r--r-- | doc/man/8/rbd.rst | 7 | ||||
| -rw-r--r-- | man/rbd.8 | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst index b11613ad74b..e6a02b0588f 100644 --- a/doc/man/8/rbd.rst +++ b/doc/man/8/rbd.rst @@ -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. diff --git a/man/rbd.8 b/man/rbd.8 index 446db793e7c..6004244e0ba 100644 --- a/man/rbd.8 +++ b/man/rbd.8 @@ -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. . |