remove init script workaround, style fixes

Nordstrom · Oct 20, 2015 · 58176d2 · 58176d2
1 parent 6a44af2
commit 58176d2
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 462 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -34,6 +34,7 @@ provisioner:
 platforms:
   - name: centos-6.6
   - name: ubuntu-12.04
+  - name: debian-7.8
 
 suites:
   - name: default

diff --git a/Berksfile.lock b/Berksfile.lock
@@ -4,8 +4,8 @@ DEPENDENCIES
     metadata: true
 
 GRAPH
-  apt (2.7.0)
-  grafana2 (0.1.8)
+  apt (2.8.2)
+  grafana2 (0.1.9)
     apt (>= 0.0.0)
     yum (>= 0.0.0)
   yum (3.6.0)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Revision History for grafana2
 
+## 0.1.9
+- Jon Cowie <[email protected]>
+- Fix for debian repo
+
+- Nathan Haneysmith <[email protected]>
+- Remove init script workaround
+- Style fixes for Rubocop
+
 ## 0.1.8
 - Nathan Haneysmith <[email protected]>
 - Fix for init scripts from grafana master

diff --git a/files/centos/grafana-server b/files/centos/grafana-server
diff --git a/files/default/grafana-server b/files/default/grafana-server