]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8bd90b1 d06b65a)
Merge PR #25630 into master
authorSage Weil <sage@redhat.com>
Thu, 20 Dec 2018 12:48:41 +0000 (06:48 -0600)
committerSage Weil <sage@redhat.com>
Thu, 20 Dec 2018 12:48:41 +0000 (06:48 -0600)
* refs/pull/25630/head:
osd/OSDMap: cancel mapping if target osd is out

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSDMap.cc patch | diff1 | diff2 | blob | history

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