]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #14060 from LiumxNL/wip-170321
authorYuri Weinstein <yuri.weinstein@gmail.com>
Thu, 23 Mar 2017 15:46:36 +0000 (08:46 -0700)
committerGitHub <noreply@github.com>
Thu, 23 Mar 2017 15:46:36 +0000 (08:46 -0700)
osd: combine unstable stats with info.stats when publish stats to osd

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

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