From: Sage Weil <sage@inktank.com>
Date: Tue, 11 Feb 2014 16:32:37 +0000 (-0800)
Subject: Merge pull request #1210 from dachary/dumpling
X-Git-Tag: v0.67.6~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4889234f80dbd95e5b2012ff9bfc2d87960034e2;p=ceph.git

Merge pull request #1210 from dachary/dumpling

common: admin socket fallback to json-pretty format (dumpling)

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

4889234f80dbd95e5b2012ff9bfc2d87960034e2