]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b581df1 8aaa854)
Merge pull request #11545 from majianpeng/osdc-objectcache-fix-bug
authorJohn Spray <jspray@redhat.com>
Fri, 11 Nov 2016 11:06:53 +0000 (12:06 +0100)
committerGitHub <noreply@github.com>
Fri, 11 Nov 2016 11:06:53 +0000 (12:06 +0100)
osdc: After write try merge bh.

Reviewed-by: John Spray <john.spray@redhat.com>
1  2 
src/osdc/ObjectCacher.cc patch | diff1 | diff2 | blob | history

diff --cc src/osdc/ObjectCacher.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.