Merge pull request #335 from JulienBalestra/json_ext
authorDan Williams <dcbw@redhat.com>
Fri, 2 Dec 2016 19:33:36 +0000 (13:33 -0600)
committerGitHub <noreply@github.com>
Fri, 2 Dec 2016 19:33:36 +0000 (13:33 -0600)
libcni conf: support .json file extension


Trivial merge