]> 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: 47ffcb1 6b75f2d)
Merge PR #17150 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 23 Aug 2017 17:54:30 +0000 (10:54 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 23 Aug 2017 17:54:30 +0000 (10:54 -0700)
* refs/remotes/upstream/pull/17150/head:
doc/cephfs: s/rados_max_object_size/osd_max_object_size

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

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