]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #15816 from chardan/jfw-wip-consolidate-spinlocks
authorSage Weil <sage@newdream.net>
Fri, 1 Sep 2017 21:28:03 +0000 (16:28 -0500)
committerGitHub <noreply@github.com>
Fri, 1 Sep 2017 21:28:03 +0000 (16:28 -0500)
common: consolidate spinlocks

Reviewed-by: Adam Emerson <aemerson@redhat.com>
1  2 
src/compressor/Compressor.cc
src/osd/OSD.h
src/test/perf_local.cc

Simple merge
diff --cc src/osd/OSD.h
Simple merge
Simple merge