Merge pull request #7846 from dillaman/wip-14551

rbd: update default image features

Conflicts:
	PendingReleaseNotes (trivial)

diff --cc PendingReleaseNotes
index 127aa44bc8a50c92caceac79bdbf3f31abcb74ce,0b94b198f0e1305e9d991d060692f871ccd4bd76..5da5a81b18d3e5afbf1ed87af9ec8708973ebe51
--- 1/PendingReleaseNotes
--- 2/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@@ -5,17 -5,21 +5,25 @@@ v10.0.
    during create, import, and clone operations.  The '--image-feature'
    option should be used instead.
  
 -* The 'send_pg_creates' and 'map_pg_creates' mon CLI commands are
 -  obsolete and no longer supported.
 -
 -* A new configure option 'mon_election_timeout' is added to specifically
 -  limit max waiting time of monitor election process, which was previously
 -  restricted by 'mon_lease'.
++* The rbd legacy image format (version 1) is deprecated with the Jewel release.
++  Attempting to create a new version 1 RBD image will result in a warning.
++  Future releases of Ceph will remove support for version 1 RBD images.
+ 
+ * The default RBD image features for new images have been updated to enable
+   the following: exclusive lock, object map, fast-diff, and deep-flatten.
+   These features are not currently supported by the RBD kernel driver nor older
+   RBD clients. These features can be disabled on a per-image basis via the RBD
+   CLI or the default features can be updated to the pre-Jewel setting by adding
+   the following to the client section of the Ceph configuration file:
+     rbd default features = 1
+ 
 +* The 'send_pg_creates' and 'map_pg_creates' mon CLI commands are
 +  obsolete and no longer supported.
 +
 +* A new configure option 'mon_election_timeout' is added to specifically
 +  limit max waiting time of monitor election process, which was previously
 +  restricted by 'mon_lease'.
 +
- * The rbd legacy image format (version 1) is deprecated with the Jewel release.
-   Attempting to create a new version 1 RBD image will result in a warning.
-   Future releases of Ceph will remove support for version 1 RBD images.
- 
  v9.3.0
  ======
  * Some symbols wrongly exposed by librados in v9.1.0 and v9.2.0 were removed.

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/test/cli/rbd/help.t
Simple merge

diff --cc src/tools/rbd/ArgumentTypes.cc
Simple merge