]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #26353 into master
authorSage Weil <sage@redhat.com>
Sun, 17 Feb 2019 16:44:33 +0000 (10:44 -0600)
committerSage Weil <sage@redhat.com>
Sun, 17 Feb 2019 16:44:33 +0000 (10:44 -0600)
* refs/pull/26353/head:
osd/PG: print get/put under debug_refs
osd: clear priv on heartbeat_reset

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/osd/OSD.cc

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