summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md4
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 10 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1580840999..fa4b3d3dab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
This changelog reflects the current state of chef's master branch on github and may not reflect the current released version of chef, which is [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef).
-## [v12.18.10](https://github.com/chef/chef/tree/v12.18.10) (2016-12-22)
-[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.10)
+## [v12.18.11](https://github.com/chef/chef/tree/v12.18.11) (2016-12-22)
+[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.11)
**Implemented enhancements:**
diff --git a/Gemfile.lock b/Gemfile.lock
index 15426cff91..c3b75a098f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,10 +47,10 @@ GIT
PATH
remote: .
specs:
- chef (12.18.10)
+ chef (12.18.11)
addressable
bundler (>= 1.10)
- chef-config (= 12.18.10)
+ chef-config (= 12.18.11)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -76,10 +76,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.18.10-universal-mingw32)
+ chef (12.18.11-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.18.10)
+ chef-config (= 12.18.11)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -120,7 +120,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.18.10)
+ chef-config (12.18.11)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index fdd1284a2b..053bca6c0f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.18.10 \ No newline at end of file
+12.18.11 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 6b4b36d8b1..974bba92ef 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "12.18.10"
+ VERSION = "12.18.11"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 88319a601e..bf23aaf276 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -21,7 +21,7 @@
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "12.18.10"
+ VERSION = "12.18.11"
end
#