From: Sage Weil <sage@inktank.com>
Date: Fri, 17 Jan 2014 06:42:39 +0000 (-0800)
Subject: Merge pull request #1104 from concubidated/master
X-Git-Tag: v0.78~311
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d6b2f87e203a799a2ed4386c9d224694006cceba;p=ceph.git

Merge pull request #1104 from concubidated/master

osd: OSDMap: fix output from ceph status --format=json for num_in_osds

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

d6b2f87e203a799a2ed4386c9d224694006cceba