]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #29052 into master
authorSage Weil <sage@redhat.com>
Mon, 22 Jul 2019 18:40:53 +0000 (13:40 -0500)
committerSage Weil <sage@redhat.com>
Mon, 22 Jul 2019 18:40:53 +0000 (13:40 -0500)
* refs/pull/29052/head:
common/ceph_time: make operator<< for timespan less useless
include/encoding: fix encode/decode for signed durations
osd/osd_types: make pg_history_t operator<< more concise
osd: do not rebind heartbeat messengers on wrongly marked down
ceph_test_osd_stale_read: add StaleRead test
osd/PeeringState: restructure init_primary_up_acting a bit
msg/async: add ms_blackhole_$type options

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/common/legacy_config_opts.h
src/common/options.cc
src/osd/OSD.cc

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