From: Jason Dillaman Date: Tue, 3 Apr 2018 13:17:21 +0000 (-0400) Subject: Merge pull request #20460 from colletj/v1_image_creation_disallow X-Git-Tag: v13.1.0~422 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b08c0609c181a9b98f3a75cd0acd84eb895b3d3;p=ceph.git Merge pull request #20460 from colletj/v1_image_creation_disallow librbd: disallow creation of v1 image format Reviewed-by: Jason Dillaman --- 3b08c0609c181a9b98f3a75cd0acd84eb895b3d3 diff --cc src/test/cli-integration/rbd/formatted-output.t index 2e73dcd7a6c2,6859ff965b83..f9ec49b22be2 --- a/src/test/cli-integration/rbd/formatted-output.t +++ b/src/test/cli-integration/rbd/formatted-output.t @@@ -12,11 -12,11 +12,11 @@@ ls on empty pool never containing image create ======= - $ rbd create -s 1024 --image-format 1 foo - $ RBD_FORCE_ALLOW_V1=1 rbd create -s 1024 --image-format 1 foo ++ $ RBD_FORCE_ALLOW_V1=1 rbd create -s 1024 --image-format 1 foo --log-to-stderr=false rbd: image format 1 is deprecated $ rbd create -s 512 --image-format 2 bar $ rbd create -s 2048 --image-format 2 --image-feature layering baz - $ rbd create -s 1 --image-format 1 quux - $ RBD_FORCE_ALLOW_V1=1 rbd create -s 1 --image-format 1 quux ++ $ RBD_FORCE_ALLOW_V1=1 rbd create -s 1 --image-format 1 quux --log-to-stderr=false rbd: image format 1 is deprecated $ rbd create -s 1G --image-format 2 quuy