summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2017-01-17 18:42:26 +0000
committerChef Versioner <chef-versioner@chef.io>2017-01-17 18:42:26 +0000
commit51d1b7e2003bee7c03f363866743abd6c9b6750d (patch)
tree185824adfdcb4cbe6fa9b1d09fc01e55347f3835
parent6003f2f82210163573076633c9cb3a64ea30a995 (diff)
downloadchef-51d1b7e2003bee7c03f363866743abd6c9b6750d.tar.gz
Bump version of chef to 12.18.36 by Chef Versioner.v12.18.36
-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 26645e4481..d94946d2e7 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.35](https://github.com/chef/chef/tree/v12.18.35) (2017-01-17)
-[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.35)
+## [v12.18.36](https://github.com/chef/chef/tree/v12.18.36) (2017-01-17)
+[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.36)
**Implemented enhancements:**
diff --git a/Gemfile.lock b/Gemfile.lock
index 88619064ec..eaeab641cf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,11 +47,11 @@ GIT
PATH
remote: .
specs:
- chef (12.18.35)
+ chef (12.18.36)
addressable
bcrypt_pbkdf (~> 1.0.0)
bundler (>= 1.10)
- chef-config (= 12.18.35)
+ chef-config (= 12.18.36)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -79,11 +79,11 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.18.35-universal-mingw32)
+ chef (12.18.36-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0.0)
bundler (>= 1.10)
- chef-config (= 12.18.35)
+ chef-config (= 12.18.36)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -126,7 +126,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.18.35)
+ chef-config (12.18.36)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index de0303d606..c4ce6544bd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.18.35 \ No newline at end of file
+12.18.36 \ 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 58bf259c7a..10ae5f5bdb 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.35"
+ VERSION = "12.18.36"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 6596342d01..fec0cef03a 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.35"
+ VERSION = "12.18.36"
end
#