summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2016-12-05 11:11:06 +0000
committerChef Versioner <chef-versioner@chef.io>2016-12-05 11:11:06 +0000
commitf330975b622a1f15bde8f0b2a9a4f8a9e95d0d50 (patch)
tree8d67611d7e5167f0a40ea17bf51533a6f16e7b3d
parent0c14a50be9e728dc7956717c26166e63bd99d8bb (diff)
downloadchef-f330975b622a1f15bde8f0b2a9a4f8a9e95d0d50.tar.gz
Bump version of chef to 12.17.36 by Chef Versioner.v12.17.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 06069fb379..f4612e4ecd 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 **12.16.42**.
-## [v12.17.35](https://github.com/chef/chef/tree/v12.17.35) (2016-12-03)
-[Full Changelog](https://github.com/chef/chef/compare/v12.16.42...v12.17.35)
+## [v12.17.36](https://github.com/chef/chef/tree/v12.17.36) (2016-12-05)
+[Full Changelog](https://github.com/chef/chef/compare/v12.16.42...v12.17.36)
**Implemented enhancements:**
diff --git a/Gemfile.lock b/Gemfile.lock
index 89ff822dfc..5b159f3636 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,10 +47,10 @@ GIT
PATH
remote: .
specs:
- chef (12.17.35)
+ chef (12.17.36)
addressable
bundler (>= 1.10)
- chef-config (= 12.17.35)
+ chef-config (= 12.17.36)
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.17.35-universal-mingw32)
+ chef (12.17.36-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.17.35)
+ chef-config (= 12.17.36)
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.17.35)
+ chef-config (12.17.36)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 2e4a3d10c8..b51bed7ed3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.17.35 \ No newline at end of file
+12.17.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 a2912231ac..3bbfcbdb2d 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.17.35"
+ VERSION = "12.17.36"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index bb5692b6c8..1e0f7a1db1 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.17.35"
+ VERSION = "12.17.36"
end
#