]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #14627 from badone/wip-peering-state-timing
authorSage Weil <sage@newdream.net>
Thu, 4 May 2017 02:37:39 +0000 (21:37 -0500)
committerGitHub <noreply@github.com>
Thu, 4 May 2017 02:37:39 +0000 (21:37 -0500)
osd: Implement peering state timing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/osd/OSD.cc
src/osd/PG.cc
src/osd/PG.h
src/osd/PrimaryLogPG.cc
src/osd/PrimaryLogPG.h

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