]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #22499 into master
authorSage Weil <sage@redhat.com>
Mon, 11 Jun 2018 21:13:38 +0000 (16:13 -0500)
committerSage Weil <sage@redhat.com>
Mon, 11 Jun 2018 21:13:38 +0000 (16:13 -0500)
* refs/pull/22499/head:
os/bluestore: fix SharedBlobSet deregister race

Reviewed-by: git push gh masterVarada Kari <varadaraja.kari@flipkart.com>
1  2 
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h

Simple merge
Simple merge