From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 19 Jun 2018 15:31:15 +0000 (-0400)
Subject: Merge pull request #22566 from liewegas/wip-rbd-table
X-Git-Tag: v14.0.1~1080
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=059d216221a80ae7e7aca4dbc5e86f00b28dca7d;p=ceph-ci.git

Merge pull request #22566 from liewegas/wip-rbd-table

tools/rbd/action: align column headers left

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

059d216221a80ae7e7aca4dbc5e86f00b28dca7d
diff --cc src/test/cli-integration/rbd/formatted-output.t
index 4221db1cdfe,15de34e2d59..1c3d96f1e81
--- a/src/test/cli-integration/rbd/formatted-output.t
+++ b/src/test/cli-integration/rbd/formatted-output.t
@@@ -900,7 -900,7 +900,7 @@@ whenever it is run. grep -v to ignore i
      </lock>
    </locks>
    $ rbd snap list foo
-   SNAPID NAME  SIZE TIMESTAMP 
 -  SNAPID NAME*SIZE*TIMESTAMP 
++  SNAPID*NAME*SIZE*TIMESTAMP* (glob)
    *snap*1 GiB* (glob)
    $ rbd snap list foo --format json | python -mjson.tool | sed 's/,$/, /'
    [
@@@ -921,7 -921,7 +921,7 @@@
      </snapshot>
    </snapshots>
    $ rbd snap list bar
--  SNAPID NAME     SIZE TIMESTAMP                
++  SNAPID*NAME*SIZE*TIMESTAMP* (glob)
    *snap*512 MiB* (glob)
    *snap2*1 GiB* (glob)
    $ rbd snap list bar --format json | python -mjson.tool | sed 's/,$/, /'
@@@ -960,7 -960,7 +960,7 @@@
    $ rbd snap list baz --format xml | xml_pp 2>&1 | grep -v '^new version at /usr/bin/xml_pp'
    <snapshots></snapshots>
    $ rbd snap list rbd_other/child
-   SNAPID NAME    SIZE TIMESTAMP                
 -  SNAPID NAME*SIZE*TIMESTAMP                
++  SNAPID*NAME*SIZE*TIMESTAMP* (glob)
    *snap*512 MiB* (glob)
    $ rbd snap list rbd_other/child --format json | python -mjson.tool | sed 's/,$/, /'
    [
@@@ -981,7 -981,7 +981,7 @@@
      </snapshot>
    </snapshots>
    $ rbd disk-usage --pool rbd_other 2>/dev/null
--  NAME                    PROVISIONED  USED 
++  NAME                    PROVISIONED USED  
    child@snap                  512 MiB   0 B 
    child                       512 MiB 4 MiB 
    deep-flatten-child@snap     512 MiB   0 B