]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1104 from concubidated/master
authorSage Weil <sage@inktank.com>
Fri, 17 Jan 2014 06:42:39 +0000 (22:42 -0800)
committerSage Weil <sage@inktank.com>
Fri, 17 Jan 2014 06:42:39 +0000 (22:42 -0800)
osd: OSDMap: fix output from ceph status --format=json for num_in_osds

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

Trivial merge