]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit8d94dc7f0f12e39f5de51f5b9d2f91145402498c
tree165fe7ec369e7d1e5ae2acd56e4d27027a66d655tree | snapshot
parent8c99f815f31f5857a2fd317a9e680ca6e92d0a8dcommit | diff
parent39f15bb2bed35dda91b1b94c26b23c8951fedac5commit | diff
Merge PR #30139 into master

* refs/pull/30139/head:
mgr/DaemonServer: skip adjusting pgp_num when merging is in-progress

Reviewed-by: Sage Weil <sage@redhat.com>
src/mgr/DaemonServer.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.