]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24133 into master
authorSage Weil <sage@redhat.com>
Sun, 23 Sep 2018 16:17:03 +0000 (11:17 -0500)
committerSage Weil <sage@redhat.com>
Sun, 23 Sep 2018 16:17:03 +0000 (11:17 -0500)
* refs/pull/24133/head:
common/Finisher: convert to ceph::mutex etc
common/ceph_mutex: ceph::{mutex,condition_variable,lock_guard}
common/mutex_debug: take const char * to ctor, and require a name
common/mutex_debug: add lockdep support for recursive_mutex_debug
common/mutex_debug: fix whitespace
common/mutex_debug: refactor to remove intermediate class
common/lockdep: add recursive flag for _will_lock
do_cmake.sh: default to Debug build
.gitignore: ignore build.*/

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge