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: 4d10cb8 4fbf389)

author	Sage Weil <sage@redhat.com>
	Mon, 9 May 2016 13:14:10 +0000 (09:14 -0400)
committer	Sage Weil <sage@redhat.com>
	Mon, 9 May 2016 13:14:10 +0000 (09:14 -0400)
commit	c88a9312126f3183f55c7fe1741cad87eb0877b2
tree	f535b780507d6c693947359d24d3897b0a41dcbd	tree \| snapshot
parent	4d10cb86bd392a1e879ec8adcea2634bc8ef3b50	commit \| diff
parent	4fbf3891aab16347d02782f7c1c0400f9e0896af	commit \| diff

Merge pull request #8920 from XinzeChi/wip-race-shutdown

osd: fix deadlock in OSD::_committed_osd_maps

Reviewed-by: Sage Weil <sage@redhat.com>

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