]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #12868 from athanatos/wip-17899-jewel
authorSamuel Just <sjust@redhat.com>
Wed, 11 Jan 2017 00:25:18 +0000 (16:25 -0800)
committerGitHub <noreply@github.com>
Wed, 11 Jan 2017 00:25:18 +0000 (16:25 -0800)
OSDMonitor: only reject MOSDBoot based on up_from if inst matches

Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge