From: Sage Weil <sage@redhat.com>
Date: Mon, 22 Jul 2019 18:40:53 +0000 (-0500)
Subject: Merge PR #29052 into master
X-Git-Tag: v15.1.0~2136
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bef4652845fec95a900adf61e831d5e1603eda8a;p=ceph.git

Merge PR #29052 into master

* 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>
---

bef4652845fec95a900adf61e831d5e1603eda8a