]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #23509 into master
authorSage Weil <sage@redhat.com>
Thu, 30 Aug 2018 13:52:49 +0000 (08:52 -0500)
committerSage Weil <sage@redhat.com>
Thu, 30 Aug 2018 13:52:49 +0000 (08:52 -0500)
* refs/pull/23509/head:
OSD: add recovery bytes counter to osd logger

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc
src/osd/OSD.h
src/osd/ReplicatedBackend.cc

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