From: Dan Williams <dcbw@redhat.com>
Date: Fri, 2 Dec 2016 19:33:36 +0000 (-0600)
Subject: Merge pull request #335 from JulienBalestra/json_ext
X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=b0808a006a9ea8729dd20e35b32bb523bd8ad745;p=cni.git

Merge pull request #335 from JulienBalestra/json_ext

libcni conf: support .json file extension
---

b0808a006a9ea8729dd20e35b32bb523bd8ad745