]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #15319 from liewegas/wip-upmap
authorSage Weil <sage@newdream.net>
Sun, 28 May 2017 03:17:14 +0000 (22:17 -0500)
committerGitHub <noreply@github.com>
Sun, 28 May 2017 03:17:14 +0000 (22:17 -0500)
mon,osd/OSDMap: a couple pg-upmap fixes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/mon/OSDMonitor.cc

Simple merge