From: Sage Weil <sage@newdream.net>
Date: Fri, 8 Mar 2013 21:49:04 +0000 (-0800)
Subject: Merge pull request #96 from concubidated/master
X-Git-Tag: v0.60~111
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c40124bcbb9a660b649fe7f2c813698b827ad0b;p=ceph.git

Merge pull request #96 from concubidated/master

Fix output of command 'ceph osd tree --format=json'

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

2c40124bcbb9a660b649fe7f2c813698b827ad0b