]> 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: 9cdd2fe 0b1e515)
Merge PR #20113 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 30 Jan 2018 23:17:10 +0000 (15:17 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 30 Jan 2018 23:17:10 +0000 (15:17 -0800)
* refs/pull/20113/head:
osdc/ObjectCacher: don't merge TX buffer heads
osdc/ObjectCacher: fix off-by-one error in bh_write_commit()

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

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