From: Yuri Weinstein <yuri.weinstein@gmail.com>
Date: Thu, 23 Mar 2017 15:46:36 +0000 (-0700)
Subject: Merge pull request #14060 from LiumxNL/wip-170321
X-Git-Tag: v12.0.2~334
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0620e81581e182f31e76e027420507ee935b3d34;p=ceph.git

Merge pull request #14060 from LiumxNL/wip-170321

osd: combine unstable stats with info.stats when publish stats to osd

Reviewed-by: Sage Weil <sage@redhat.com>
---

0620e81581e182f31e76e027420507ee935b3d34