]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitecc9564fbb5599ea8e9c5526e6fc44c259069960
treed81948b90f8c7710e95ead1ecfdfcbcc248cf3fftree | snapshot
parent34e82cb4369c6dfd73b4ae3f831232534f4b1779commit | diff
parent7bc97797eb5103f9ec2a2042b7e8d015026ea122commit | diff
Merge PR #24010 into master

* 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>
src/osd/OSD.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.