]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR 16149 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 21 Jul 2017 20:22:44 +0000 (13:22 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 21 Jul 2017 20:22:44 +0000 (13:22 -0700)
* refs/remotes/upstream/pull/16149/head:
mds: misc cleanup

Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/mds/Server.cc
src/mon/MDSMonitor.cc

Simple merge
Simple merge