]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f595e70 24a67c0)
Merge PR #23553 into luminous
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 28 Sep 2018 21:28:51 +0000 (14:28 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 28 Sep 2018 21:28:56 +0000 (14:28 -0700)
* refs/pull/23553/head:
mds: report lagginess at lower debug
MDSMonitor: note beacons and cluster changes at low dbg level

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Conflicts:
    src/mds/Beacon.cc

1  2 
src/mds/Beacon.cc patch | diff1 | diff2 | blob | history

diff --cc src/mds/Beacon.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.