]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #24623 into master
authorSage Weil <sage@redhat.com>
Fri, 19 Oct 2018 13:31:29 +0000 (08:31 -0500)
committerSage Weil <sage@redhat.com>
Fri, 19 Oct 2018 13:31:29 +0000 (08:31 -0500)
commita9b4ed6c016cb8b8a6f0fa9ff237818e1afeb24e
tree5157aabaf75a7f39ba8a64b26742bb4d3af5e0f1
parentccb04898959190be6a52d5c9f2ab6efa72badd50
parent948635a8b2130b561fae08bd5b2405a2dc6d3e9f
Merge PR #24623 into master

* refs/pull/24623/head:
mgr: Mutex::Locker -> std::lock_guard
kv: Mutex::Locker -> std::lock_guard
librados: Mutex::Locker -> std::lock_guard
mon: Mutex::Locker -> std::lock_guard
osd: Mutex::Locker -> std::lock_guard

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
src/mgr/Mgr.cc
src/mon/Monitor.cc
src/mon/OSDMonitor.cc
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc
src/osd/PG.h