From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 11 Nov 2015 05:18:04 +0000 (-0800)
Subject: Merge pull request #5987 from dillaman/wip-rbd-refactor
X-Git-Tag: v10.0.1~103
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d46d4a98b6c0c9601f4552527893270481297c4c;p=ceph.git

Merge pull request #5987 from dillaman/wip-rbd-refactor

rbd: refactor cli command handling

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

d46d4a98b6c0c9601f4552527893270481297c4c
diff --cc src/test/run-rbd-tests
index 7ad28b469959,1f7096148a89..ac9ca714aecb
--- a/src/test/run-rbd-tests
+++ b/src/test/run-rbd-tests
@@@ -36,9 -31,8 +36,9 @@@ run_admin_socket_tests() 
  ceph_test_cls_rbd
  run_api_tests
  run_cli_tests
 +run_admin_socket_tests
  
- export RBD_CREATE_ARGS="--format 2"
+ export RBD_CREATE_ARGS="--image-format 2"
  run_cli_tests
  
  for i in 0 1 5 13 29 45