From: Sage Weil <sage@redhat.com>
Date: Tue, 28 Apr 2015 15:11:18 +0000 (-0700)
Subject: Merge pull request #4475 from ceph/wip-9538.firefly
X-Git-Tag: v0.80.10~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b36229b5aeec669cd1494f47120ae207a393846f;p=ceph.git

Merge pull request #4475 from ceph/wip-9538.firefly

mon: OSDMonitor: fallback to json-pretty in case of invalid formatter

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

b36229b5aeec669cd1494f47120ae207a393846f