From 11d9541a6f7d84e7b16940b92ca18ebc41bb5202 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Thu, 22 Jun 2017 15:04:36 -0400
Subject: [PATCH] mon: 'mon feature list' -> 'mon feature ls'

Signed-off-by: Sage Weil <sage@redhat.com>
---
 doc/release-notes.rst         | 14 +++++---------
 qa/workunits/cephtool/test.sh |  2 +-
 src/mon/MonCommands.h         |  2 +-
 src/mon/MonmapMonitor.cc      |  2 +-
 src/test/mon/misc.sh          |  4 ++--
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/doc/release-notes.rst b/doc/release-notes.rst
index 944fe32259800..9687b5f88187b 100644
--- a/doc/release-notes.rst
+++ b/doc/release-notes.rst
@@ -197,17 +197,13 @@ Upgrade from Jewel or Kraken
    looking for the ``lumninous`` feature string in the mon map.  For
    example::
 
-     # ceph osd dump -f json-pretty
+     # ceph mon feature ls
 
-   should include::
+   should include `luminous` under persistent features::
 
-        "features": {
-            "persistent": [
-                "kraken",
-                "luminous"
-            ],
-            "optional": []
-        },
+     on current monmap (epoch NNN)
+        persistent: [kraken,luminous]
+        required: [kraken,luminous]
 
 #. Add or restart ``ceph-mgr`` daemons.  If you are upgrading from
    kraken, upgrade packages and restart ceph-mgr daemons with::
diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 36fb92a31c7e7..3ffa05148b292 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -1117,7 +1117,7 @@ function test_mon_mon()
   ceph mon_status
 
   # test mon features
-  ceph mon feature list
+  ceph mon feature ls
   ceph mon feature set kraken --yes-i-really-mean-it
   expect_false ceph mon feature set abcd
   expect_false ceph mon feature set abcd --yes-i-really-mean-it
diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 69a63964c8355..00afc2e930c69 100644
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -423,7 +423,7 @@ COMMAND("mon remove " \
 COMMAND("mon rm " \
 	"name=name,type=CephString", \
 	"remove monitor named <name>", "mon", "rw", "cli,rest")
-COMMAND("mon feature list " \
+COMMAND("mon feature ls " \
         "name=with_value,type=CephChoices,strings=--with-value,req=false", \
         "list available mon map features to be set/unset", \
         "mon", "r", "cli,rest")
diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index b5ac990dfd063..5035e1e23ce34 100644
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -309,7 +309,7 @@ bool MonmapMonitor::preprocess_command(MonOpRequestRef op)
     if (p != mon->monmap)
        delete p;
 
-  } else if (prefix == "mon feature list") {
+  } else if (prefix == "mon feature ls") {
    
     bool list_with_value = false;
     string with_value;
diff --git a/src/test/mon/misc.sh b/src/test/mon/misc.sh
index 2002ecd8944c7..52e102435cc25 100755
--- a/src/test/mon/misc.sh
+++ b/src/test/mon/misc.sh
@@ -231,9 +231,9 @@ function TEST_mon_features() {
     jqfilter='.monmap.features.optional | length == 0'
     jq_success "$jqinput" "$jqfilter" || return 1
 
-    # validate 'mon feature list'
+    # validate 'mon feature ls'
 
-    jqinput="$(ceph mon feature list --format=json 2>/dev/null)"
+    jqinput="$(ceph mon feature ls --format=json 2>/dev/null)"
     # 'kraken' and 'luminous' are supported
     jqfilter='.all.supported[] | select(. == "kraken")'
     jq_success "$jqinput" "$jqfilter" "kraken" || return 1
-- 
2.39.5