]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit07e74f803f8d2b81a560bb6d254fe4ce3503b7eb
treebda2259ff067cedc54cc9a3e90140b2ba5ae4a84
parent4ae369119d112a3e7be40c1c7a074d3beb8156db
parent642c4c3211ccfca4b25bc464a83eccfedcde5864
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>