import 15.2.2 octopus source

[ceph.git] / ceph / src / ceph.in

diff --git a/ceph/src/ceph.in b/ceph/src/ceph.in
index aedec606fb5ddf9ed0f8eb1ffa6a4e22a8f65bb4..369b9696540cb59b7085408ce6b6bd5e374fee1b 100755 (executable)
--- a/ceph/src/ceph.in
+++ b/ceph/src/ceph.in
@@ -333,7 +333,7 @@ def parse_cmdargs(args=None, target=''):
                         help="make less verbose")
 
     parser.add_argument('-f', '--format', choices=['json', 'json-pretty',
-                        'xml', 'xml-pretty', 'plain'], dest='output_format')
+                        'xml', 'xml-pretty', 'plain', 'yaml'], dest='output_format')
 
     parser.add_argument('--connect-timeout', dest='cluster_timeout',
                         type=int,