doc/releases/nautilus: move note to 14.2.2

Oops! This change was merged in 404ed645d42471b675f11fb7d11f46c006248152,
which was not part of 14.2.1 after all.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/doc/releases/nautilus.rst b/doc/releases/nautilus.rst
index d7e6bcdadf76654b90254bc7cbc8b64e956de5a1..14e85f21af4615aa7100ad571d831649a10ea1e9 100644 (file)
--- a/doc/releases/nautilus.rst
+++ b/doc/releases/nautilus.rst
@@ -33,6 +33,29 @@ Notable Changes
   are 14.2.2 (or later), are BlueStore, and (if they were created
   prior to Nautilus) have been updated via the ``repair`` function.
 
+* The default value for `mon_crush_min_required_version` has been
+  changed from `firefly` to `hammer`, which means the cluster will
+  issue a health warning if your CRUSH tunables are older than hammer.
+  There is generally a small (but non-zero) amount of data that will
+  move around by making the switch to hammer tunables; for more information,
+  see :ref:`crush-map-tunables`.
+
+  If possible, we recommend that you set the oldest allowed client to `hammer`
+  or later.  You can tell what the current oldest allowed client is with::
+
+    ceph osd dump | grep min_compat_client
+
+  If the current value is older than hammer, you can tell whether it
+  is safe to make this change by verifying that there are no clients
+  older than hammer current connected to the cluster with::
+
+    ceph features
+
+  The newer `straw2` CRUSH bucket type was introduced in hammer, and
+  ensuring that all clients are hammer or newer allows new features
+  only supported for `straw2` buckets to be used, including the
+  `crush-compat` mode for the :ref:`balancer`.
+
 Changelog
 ---------
 
@@ -253,29 +276,6 @@ ceph, general guidelines for upgrade to nautilus must be followed
 Notable Changes
 ---------------
 
-* The default value for `mon_crush_min_required_version` has been
-  changed from `firefly` to `hammer`, which means the cluster will
-  issue a health warning if your CRUSH tunables are older than hammer.
-  There is generally a small (but non-zero) amount of data that will
-  move around by making the switch to hammer tunables; for more information,
-  see :ref:`crush-map-tunables`.
-
-  If possible, we recommend that you set the oldest allowed client to `hammer`
-  or later.  You can tell what the current oldest allowed client is with::
-
-    ceph osd dump | grep min_compat_client
-
-  If the current value is older than hammer, you can tell whether it
-  is safe to make this change by verifying that there are no clients
-  older than hammer current connected to the cluster with::
-
-    ceph features
-
-  The newer `straw2` CRUSH bucket type was introduced in hammer, and
-  ensuring that all clients are hammer or newer allows new features
-  only supported for `straw2` buckets to be used, including the
-  `crush-compat` mode for the :ref:`balancer`.
-
 * Ceph now packages python bindings for python3.6 instead of
   python3.4, because EPEL7 recently switched from python3.4 to
   python3.6 as the native python3. see the `announcement <https://lists.fedoraproject.org/archives/list/epel-announce@lists.fedoraproject.org/message/EGUMKAIMPK2UD5VSHXM53BH2MBDGDWMO/>`_