From: Sage Weil <sage@redhat.com>
Date: Fri, 12 Oct 2018 21:14:19 +0000 (-0500)
Subject: Merge PR #24312 into master
X-Git-Tag: v14.0.1~57
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=07e74f803f8d2b81a560bb6d254fe4ce3503b7eb;p=ceph.git

Merge PR #24312 into master

* refs/pull/24312/head:
	osd: kill the std::stringstream in ReplicatedBackend::do_repop_reply.
	osd: bump-up the dout level in PGLog::write_log_and_missing.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

07e74f803f8d2b81a560bb6d254fe4ce3503b7eb