From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 3 Jul 2017 16:11:25 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/pull/16080/head' into HEAD
X-Git-Tag: v12.1.1~201
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6eda735b0628996155f32fce0d2c152ba0238fde;p=ceph.git

Merge remote-tracking branch 'upstream/pull/16080/head' into HEAD

* upstream/pull/16080/head:
  doc/mon: clean up `mds fail`/`mds deactivate` descriptions

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

6eda735b0628996155f32fce0d2c152ba0238fde