]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 429ee4e 9b979a5)
Merge PR #27568 into master
authorSage Weil <sage@redhat.com>
Tue, 16 Apr 2019 19:30:23 +0000 (14:30 -0500)
committerSage Weil <sage@redhat.com>
Tue, 16 Apr 2019 19:30:23 +0000 (14:30 -0500)
* refs/pull/27568/head:
doc/release/nautilus: proscribe minimum hammer tunables and straw2 on upgrade
common/options: update mon_crush_min_required_version=hammer

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
doc/releases/nautilus.rst patch | diff1 | diff2 | blob | history
src/common/options.cc patch | diff1 | diff2 | blob | history

diff --cc doc/releases/nautilus.rst
Simple merge
diff --cc src/common/options.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.