]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13131 from ovh/bp-osdmap-hammer-compat
authorNathan Cutler <presnypreklad@gmail.com>
Wed, 22 Feb 2017 21:59:41 +0000 (22:59 +0100)
committerGitHub <noreply@github.com>
Wed, 22 Feb 2017 21:59:41 +0000 (22:59 +0100)
jewel: mon: OSDMonitor: clear jewel+ feature bits when talking to Hammer OSD

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

Simple merge