]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34e82cb 7bc9779)
Merge PR #24010 into master
authorSage Weil <sage@redhat.com>
Tue, 11 Sep 2018 14:27:17 +0000 (09:27 -0500)
committerSage Weil <sage@redhat.com>
Tue, 11 Sep 2018 14:27:17 +0000 (09:27 -0500)
* refs/pull/24010/head:
osd/OSD: kick right merge source
mgr/DaemonServer: split should respect inflight creating pgs

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

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