]> 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: 8c99f81 39f15bb)
Merge PR #30139 into master
authorSage Weil <sage@redhat.com>
Sat, 7 Sep 2019 20:08:57 +0000 (15:08 -0500)
committerSage Weil <sage@redhat.com>
Sat, 7 Sep 2019 20:08:57 +0000 (15:08 -0500)
* refs/pull/30139/head:
mgr/DaemonServer: skip adjusting pgp_num when merging is in-progress

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

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