]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47bf240 6ac76a8)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.