]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #12009 from 363921219/master
authorKefu Chai <tchaikov@gmail.com>
Wed, 23 Nov 2016 11:01:04 +0000 (19:01 +0800)
committerGitHub <noreply@github.com>
Wed, 23 Nov 2016 11:01:04 +0000 (19:01 +0800)
osd: clean up process_peering_events

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

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