Merge branch 'master' of github.com:rightscale-cookbooks/rs-haproxy

rightscale-cookbooks · Jan 24, 2017 · d97f1c8 · d97f1c8
2 parents ed605b1 + aca6919
commit d97f1c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -11,7 +11,7 @@ DEPENDENCIES
     branch: centos-7-support
   machine_tag
     git: https://github.com/rightscale-cookbooks/machine_tag.git
-    revision: 2cf4d496223986fdb13af29a7d3434ed7fbda82e
+    revision: 581dd0b7ddf2e65939527bb5e6c6c47788d1bf33
   marker
     git: https://github.com/rightscale-cookbooks/marker.git
     revision: 058e70879408fceceb628c600d487b1ddfa06cdb
@@ -77,7 +77,7 @@ GRAPH
   iis (5.0.5)
     windows (>= 1.34.6)
   lvm (3.1.0)
-  machine_tag (2.0.0)
+  machine_tag (2.0.1)
     apt (>= 0.0.0)
     build-essential (>= 0.0.0)
   mariadb (1.0.1)

diff --git a/metadata.rb b/metadata.rb
@@ -7,6 +7,7 @@
 version          '2.0.0'
 issues_url       'https://github.com/rightscale-cookbooks/rs-haproxy/issues'
 source_url       'https://github.com/rightscale-cookbooks/rs-haproxy'
+chef_version '>= 12.0' if respond_to?(:chef_version)
 
 depends 'marker'
 depends 'haproxy'