]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/pull/16080/head' into HEAD
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 3 Jul 2017 16:11:25 +0000 (09:11 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 3 Jul 2017 16:11:25 +0000 (09:11 -0700)
* upstream/pull/16080/head:
  doc/mon: clean up `mds fail`/`mds deactivate` descriptions

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mon/MonCommands.h

Simple merge