From: pcuzner <pcuzner@redhat.com>
Date: Thu, 22 Jun 2017 00:14:48 +0000 (+1200)
Subject: Merge pull request #21 from zmc/wip-grafana-2
X-Git-Tag: v1.0~67^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6dfd0c30308686723ebdb7842cf89e22af7e2bab;p=cephmetrics.git

Merge pull request #21 from zmc/wip-grafana-2

Ship grafana.ini from this repo
---

6dfd0c30308686723ebdb7842cf89e22af7e2bab