]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6352009 bc7cfe0)
Merge PR #24787 into master
authorSage Weil <sage@redhat.com>
Mon, 29 Oct 2018 13:36:34 +0000 (08:36 -0500)
committerSage Weil <sage@redhat.com>
Mon, 29 Oct 2018 13:36:34 +0000 (08:36 -0500)
commitc40685ebdd18b12ecd885e27319d8663380e430e
tree01bf7527e90059856538e8ff4b6680e008d66990tree | snapshot
parent6352009a0e7bbbe8021a84ec8b49682f01655977commit | diff
parentbc7cfe0885d905c6fd4a7fad8640c93f4e929afacommit | diff
Merge PR #24787 into master

* refs/pull/24787/head:
Merge PR #24796 into nautilus
osd: fix heartbeat_reset unlock
Merge PR #24780 into nautilus
Merge PR #24761 into nautilus
Merge PR #24651 into nautilus
osd: fix race between op_wq and context_queue
test: Make sure kill_daemons failure will be easy to find
test: Add flush_pg_stats to make test more deterministic
src/osd/OSD.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.