doc/releases/octopus: enforce mds_join_fs cluster affinity

The "enforce mds_join_fs cluster affinity" release note was
added to PendingReleaseNotes by 3fac3b1236c4918e9640e38fe7f5f59efc0a23b9
but it never made its way into the official v15.2.0 release notes.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index dfb8948eefcec249072b57a3cc2094d448864d70..1ca7be18e6e7b2f93896b394d83d354e9295c40d 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -3,12 +3,6 @@
 
 * CVE-2020-10736: Fixes an authorization bypass in monitor and manager daemons
 
-* MDS daemons can now be assigned to manage a particular file system via the
-  new ``mds_join_fs`` option. The monitors will try to use only MDS for a file
-  system with mds_join_fs equal to the file system name (strong affinity).
-  Monitors may also deliberately failover an active MDS to a standby when the
-  cluster is otherwise healthy if the standby has stronger affinity.
-
 * RGW Multisite: A new fine grained bucket-granularity policy configuration
   system has been introduced and it supersedes the previous coarse zone sync
   configuration (specifically the ``sync_from`` and ``sync_from_all`` fields

diff --git a/doc/releases/octopus.rst b/doc/releases/octopus.rst
index e6d3200312c33598753b8b100d93dcd3586f6cf4..e4965603d2ed42ae5240f73fbb0e32361228a9b6 100644 (file)
--- a/doc/releases/octopus.rst
+++ b/doc/releases/octopus.rst
@@ -710,6 +710,12 @@ Upgrade compatibility notes
   there are fewer OSDs in one of the racks. In those cases, the 
   configuration value can be increased.
 
+* MDS daemons can now be assigned to manage a particular file system via the
+  new ``mds_join_fs`` option. The monitors will try to use only MDS for a file
+  system with mds_join_fs equal to the file system name (strong affinity).
+  Monitors may also deliberately failover an active MDS to a standby when the
+  cluster is otherwise healthy if the standby has stronger affinity.
+
 
 Changelog
 ---------