]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 73123ee c3164df)
Merge PR #21934 into master v14.0.0
authorSage Weil <sage@redhat.com>
Fri, 25 May 2018 22:52:41 +0000 (17:52 -0500)
committerSage Weil <sage@redhat.com>
Fri, 25 May 2018 22:52:41 +0000 (17:52 -0500)
commit15edf77cc39e1a76b6e629ad710a5ad966d0dd34
tree96aaba47700dee4e237692e497785725972c6ca6tree | snapshot
parent73123ee1c85e924ec701befebd56f08458595718commit | diff
parentc3164df959ba76a865c8320fbb4f93a3d0840eafcommit | diff
Merge PR #21934 into master

* refs/pull/21934/head:
qa/standalone/mon/misc: fix features test
qa/workunits: osd require-osd-release mimic -> nautilus
test/cli/monmaptool/feature-set-unset: fix unknown ids
test/cli/monmaptool: fix test
osd/OSDMap: make NAUTILUS feature bit significant
mon: add initial NAUTILUS feature/compatset bits

Reviewed-by: Kefu Chai <kchai@redhat.com>
src/common/options.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.