]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24107 into master
authorSage Weil <sage@redhat.com>
Thu, 20 Sep 2018 19:29:55 +0000 (14:29 -0500)
committerSage Weil <sage@redhat.com>
Thu, 20 Sep 2018 19:29:55 +0000 (14:29 -0500)
* refs/pull/24107/head:
common: Lock -> lock, Unlock -> lock, TryLock -> try_lock
common: Mutex::Locker -> std::lock_guard<Mutex>
common/Mutex: typedef lock_guard<Mutex> Locker
common/Mutex: Lock -> lock, Unlock -> unlock
common/Mutex: kill mutex_perf_counter

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Trivial merge