From: Sage Weil Date: Tue, 11 Feb 2014 16:31:46 +0000 (-0800) Subject: Merge pull request #1208 from dachary/emperor X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=30a346b5987210016988b67e76bfd966ca026637;p=ceph.git Merge pull request #1208 from dachary/emperor common: admin socket fallback to json-pretty format (emperor) Reviewed-by: Sage Weil --- 30a346b5987210016988b67e76bfd966ca026637