From: Sage Weil <sage@inktank.com>
Date: Tue, 11 Feb 2014 16:30:31 +0000 (-0800)
Subject: Merge pull request #1207 from dachary/wip-7378
X-Git-Tag: v0.78~203
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dd200c924e04d3db9fc26357ec3174043e9b5fe2;p=ceph.git

Merge pull request #1207 from dachary/wip-7378

common: admin socket fallback to json-pretty format

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

dd200c924e04d3db9fc26357ec3174043e9b5fe2