]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #28180 from athanatos/sjust/wip-crimson-peering
authorSamuel Just <sjust@redhat.com>
Mon, 3 Jun 2019 20:41:05 +0000 (13:41 -0700)
committerGitHub <noreply@github.com>
Mon, 3 Jun 2019 20:41:05 +0000 (13:41 -0700)
Integrate PeeringState into crimson, fix related bugs

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/osd/PG.cc

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