Merge branch 'master' into feature/ubuntu-16.04

2017-06-09 16:36:19 +02:00
parent b567547bdc afc07c3192
commit 5385813eda
873 changed files with 38209 additions and 15880 deletions
--- a/cookbooks/compat_resource/files/lib/chef_upstream_version.rb
+++ b/cookbooks/compat_resource/files/lib/chef_upstream_version.rb
@@ -0,0 +1,3 @@
+        module ChefCompat
+          CHEF_UPSTREAM_VERSION="12.16.42" unless defined? CHEF_UPSTREAM_VERSION
+        end