]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5eaeb92 783aaeb)
Merge PR #23250 into mimic
authorSage Weil <sage@redhat.com>
Thu, 26 Jul 2018 13:47:17 +0000 (08:47 -0500)
committerSage Weil <sage@redhat.com>
Thu, 26 Jul 2018 13:47:17 +0000 (08:47 -0500)
commitf95b5f6051ef406909067d39ea10254044fe4b9e
tree3127e253089108011191769ca1d8d04634788e05tree | snapshot
parent5eaeb92aff178d2e3091c77f77b753e2a33ccd44commit | diff
parent783aaebb6d1e15352e2ae6c39d8411a02e2b3df3commit | diff
Merge PR #23250 into mimic

* refs/pull/23250/head:
osd/OSDMap: fix CEPHX_V2 osd requirement to nautilus, not mimic

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Unnamed repository; edit this file 'description' to name the repository.