]> 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: 838958d 91a2d40)
Merge PR #23949 into master
authorSage Weil <sage@redhat.com>
Mon, 10 Sep 2018 12:41:44 +0000 (07:41 -0500)
committerSage Weil <sage@redhat.com>
Mon, 10 Sep 2018 12:41:44 +0000 (07:41 -0500)
* refs/pull/23949/head:
mon/OSDMonitor: invalidate max_failed_since on cancel_report

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/mon/OSDMonitor.h patch | diff1 | diff2 | blob | history

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