]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7754 from xiexingguo/xxg-wip-14845
authorSage Weil <sage@redhat.com>
Fri, 18 Mar 2016 01:54:32 +0000 (21:54 -0400)
committerSage Weil <sage@redhat.com>
Fri, 18 Mar 2016 01:54:32 +0000 (21:54 -0400)
osd: fix inaccurate counter and skip over queueing an empty transaction

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/common/config_opts.h
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc
src/osd/osd_types.h

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