]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cbec0f 4518c40)
Merge pull request #25626 from xiexingguo/wip-no-upmap-for-merge
authorKefu Chai <tchaikov@gmail.com>
Sun, 23 Dec 2018 14:28:49 +0000 (22:28 +0800)
committerGitHub <noreply@github.com>
Sun, 23 Dec 2018 14:28:49 +0000 (22:28 +0800)
mgr/balancer: skip auto-balancing for pools with pending pg-merge

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.