]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5293 from majianpeng/oprequest-markevent
authorKefu Chai <tchaikov@gmail.com>
Sat, 8 Aug 2015 13:42:56 +0000 (21:42 +0800)
committerKefu Chai <tchaikov@gmail.com>
Sat, 8 Aug 2015 13:42:56 +0000 (21:42 +0800)
osd: Oprequest markevent

Reviewed-by: Huang Jun <hjwsm1989@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc
src/osd/PG.cc
src/osd/ReplicatedPG.cc

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