From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 15 Dec 2017 19:07:58 +0000 (-0800)
Subject: Merge PR #19440 into master
X-Git-Tag: v13.0.2~769
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ee9d5f9a45f27f0160b9892ad543dacad60b00fa;p=ceph.git

Merge PR #19440 into master

* refs/pull/19440/head:
	mds: update mds option descriptions
	mds: obsolete MDSMap option configs
	mds: organize Filesystem class def

Reviewed-by: John Spray <john.spray@redhat.com>
---

ee9d5f9a45f27f0160b9892ad543dacad60b00fa
diff --cc PendingReleaseNotes
index cd10c1362cf,e5e6c2cd63a..b48eb44cf70
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@@ -20,8 -20,12 +20,13 @@@
        - mds remove_data_pool -> fs rm_data_pool
        - mds rm_data_pool -> fs rm_data_pool
  
+   * New CephFS file system attributes session_timeout and session_autoclose
+     are configurable via `ceph fs set`. The MDS config options
+     mds_session_timeout, mds_session_autoclose, and mds_max_file_size are now
+     obsolete.
+ 
  
 +
  >= 12.2.2
  ---------