Merge branch 'release/1.1.7' into develop

hectcastro · May 8, 2014 · 27934f8 · 27934f8
2 parents d180c22 + ea27a86
commit 27934f8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -1,19 +1,21 @@
 ---
-driver_plugin: vagrant
+driver:
+  name: vagrant
+  require_chef_omnibus: true
+  customize:
+    memory: 512
+
+provisioner:
+  name: chef_zero
 
 platforms:
 - name: ubuntu-12.04
-  driver_config:
-    box: opscode-ubuntu-12.04
-    box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box
-    customize:
-      memory: 512
+  run_list:
+  - recipe[apt]
 - name: centos-6.5
-  driver_config:
-    box: opscode-centos-6.5
-    box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box
-    customize:
-      memory: 512
+  run_list:
+  - recipe[yum]
+
 suites:
 - name: default
   run_list:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.1.7
+
+* Add attribute for `globalSuffix` configuration settings.
+
 ## v1.1.6
 
 * Add attribute for `dumpMessages` configuration setting.

diff --git a/metadata.rb b/metadata.rb
@@ -2,7 +2,7 @@
 maintainer_email  "hectcastro@gmail.com"
 license           "Apache 2.0"
 description       "Installs and configures StatsD."
-version           "1.1.6"
+version           "1.1.7"
 recipe            "statsd", "Installs and configures StatsD"
 name              "statsd"