summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2016-12-03 00:25:33 +0000
committerChef Versioner <chef-versioner@chef.io>2016-12-03 00:25:33 +0000
commite1cd3b3be2aa894b6dd50929efa85efd57610079 (patch)
tree711767a2b1be2a82a7fd6b40cf9d6622870d73fb
parent4755f863b11a2aa717cfc53999cc005804428fd0 (diff)
downloadchef-e1cd3b3be2aa894b6dd50929efa85efd57610079.tar.gz
Bump version of chef to 12.17.35 by Chef Versioner.v12.17.35
-rw-r--r--CHANGELOG.md5
-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, 11 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e641b7f1ce..06069fb379 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,11 @@
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.34](https://github.com/chef/chef/tree/v12.17.34) (2016-12-02)
-[Full Changelog](https://github.com/chef/chef/compare/v12.16.42...v12.17.34)
+## [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)
**Implemented enhancements:**
+- add support for zfs to mount provider [\#5597](https://github.com/chef/chef/issues/5597)
- Action :umount for mount resource is an obtuse anachronism [\#5595](https://github.com/chef/chef/issues/5595)
- Yum: Purge yum cache before deleting repo config [\#5509](https://github.com/chef/chef/pull/5509) ([iancward](https://github.com/iancward))
- Knife Bootstrap: Passing config\_log\_level and config\_log\_location from config.rb [\#5502](https://github.com/chef/chef/pull/5502) ([dheerajd-msys](https://github.com/dheerajd-msys))
diff --git a/Gemfile.lock b/Gemfile.lock
index 81e2f0beca..89ff822dfc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,10 +47,10 @@ GIT
PATH
remote: .
specs:
- chef (12.17.34)
+ chef (12.17.35)
addressable
bundler (>= 1.10)
- chef-config (= 12.17.34)
+ chef-config (= 12.17.35)
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.34-universal-mingw32)
+ chef (12.17.35-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.17.34)
+ chef-config (= 12.17.35)
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.34)
+ chef-config (12.17.35)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 6ab5d3e45d..2e4a3d10c8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.17.34 \ No newline at end of file
+12.17.35 \ 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 3ce1917c15..a2912231ac 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.34"
+ VERSION = "12.17.35"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 2a0d0cdea9..bb5692b6c8 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.34"
+ VERSION = "12.17.35"
end
#