]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da75978 20c2175)
Merge pull request #4475 from ceph/wip-9538.firefly
authorSage Weil <sage@redhat.com>
Tue, 28 Apr 2015 15:11:18 +0000 (08:11 -0700)
committerSage Weil <sage@redhat.com>
Tue, 28 Apr 2015 15:11:18 +0000 (08:11 -0700)
mon: OSDMonitor: fallback to json-pretty in case of invalid formatter

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.