summaryrefslogtreecommitdiffstats
path: root/qa
diff options
context:
space:
mode:
authorJosh Durgin <josh.durgin@inktank.com>2012-08-16 21:03:41 +0200
committerJosh Durgin <josh.durgin@inktank.com>2012-08-16 21:57:58 +0200
commit18054ba46fe2779d8df8b1a0d69ec93ca6a66c34 (patch)
tree6c31b691d2f8a7e568ce2bad82df6c15b9416a60 /qa
parentceph-fuse: add --fuse-debug option to enable libfuse debugging (diff)
parentrbd: show snap protection status (diff)
downloadceph-18054ba46fe2779d8df8b1a0d69ec93ca6a66c34.tar.xz
ceph-18054ba46fe2779d8df8b1a0d69ec93ca6a66c34.zip
Merge branch 'wip-rbd-protect' into master
Conflicts: src/librbd.cc src/librbd/cls_rbd_client.h
Diffstat (limited to 'qa')
-rwxr-xr-xqa/workunits/rbd/import_export.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/qa/workunits/rbd/import_export.sh b/qa/workunits/rbd/import_export.sh
index 249ee448e3d..005044ab078 100755
--- a/qa/workunits/rbd/import_export.sh
+++ b/qa/workunits/rbd/import_export.sh
@@ -13,6 +13,8 @@ rbd rm testimg || true
rbd import $RBD_CREATE_ARGS /tmp/img testimg
rbd export testimg /tmp/img2
+rbd rm testimg
+
cmp /tmp/img /tmp/img2
rm /tmp/img /tmp/img2