]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24312 into master
authorSage Weil <sage@redhat.com>
Fri, 12 Oct 2018 21:14:19 +0000 (16:14 -0500)
committerSage Weil <sage@redhat.com>
Fri, 12 Oct 2018 21:14:19 +0000 (16:14 -0500)
* 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>

Trivial merge