]> 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: 9f5a7ca 57ecc1e)
Merge PR #20467 into master
authorSage Weil <sage@redhat.com>
Wed, 21 Feb 2018 16:23:38 +0000 (10:23 -0600)
committerSage Weil <sage@redhat.com>
Wed, 21 Feb 2018 16:23:38 +0000 (10:23 -0600)
* refs/pull/20467/head:
mon: mark manager beacons as no_reply

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: João Eduardo Luís <joao@suse.de>
1  2 
src/mon/MgrMonitor.cc patch | diff1 | diff2 | blob | history

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