]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #27622 into master
authorSage Weil <sage@redhat.com>
Mon, 22 Apr 2019 02:20:12 +0000 (21:20 -0500)
committerSage Weil <sage@redhat.com>
Mon, 22 Apr 2019 02:20:12 +0000 (21:20 -0500)
commitf9ab80499c10478e4d8d1a1401a33f44315075b4
treeafc69199535a95514ac979034f8ff341689177a9
parent47bf240939dca39668da24d9e8cc0053a18605ff
parent6ac76a82d73d078fa3aa02217c56131e6d38aed9
Merge PR #27622 into master

* refs/pull/27622/head:
mon: fix INCOMPAT_OCTOPUS feature number
mon/Elector: format mon_release correctly

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>