]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c872e42 18f0305)
Merge PR #24867 into master
authorSage Weil <sage@redhat.com>
Tue, 20 Nov 2018 12:50:50 +0000 (06:50 -0600)
committerSage Weil <sage@redhat.com>
Tue, 20 Nov 2018 12:50:50 +0000 (06:50 -0600)
* refs/pull/24867/head:
mon: compensate for not having STDLIB_MAP_SPLICING

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

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