git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b581df1 8aaa854)

author	John Spray <jspray@redhat.com>
	Fri, 11 Nov 2016 11:06:53 +0000 (12:06 +0100)
committer	GitHub <noreply@github.com>
	Fri, 11 Nov 2016 11:06:53 +0000 (12:06 +0100)
commit	ff9b388f15b26f52857da01615e357568d21b934
tree	43e4866305b85e450bf4c1804bdec76fcbb7dd88	tree \| snapshot
parent	b581df1778b436d6262b5fee703ce0dc114ad57d	commit \| diff
parent	8aaa8549fb58e01956069cd491ee452d78ef94f3	commit \| diff

Merge pull request #11545 from majianpeng/osdc-objectcache-fix-bug

osdc: After write try merge bh.

Reviewed-by: John Spray <john.spray@redhat.com>

src/osdc/ObjectCacher.cc

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