summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-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, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97e9d33d35..e83612a0d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.158 -->
-## [v14.0.158](https://github.com/chef/chef/tree/v14.0.158) (2018-03-22)
+<!-- latest_release 14.0.159 -->
+## [v14.0.159](https://github.com/chef/chef/tree/v14.0.159) (2018-03-22)
#### Merged Pull Requests
-- Use the latest libarchive/bzip2 defs in omnibus [#7035](https://github.com/chef/chef/pull/7035) ([tas50](https://github.com/tas50))
+- Add windows_adjoin resource [#6981](https://github.com/chef/chef/pull/6981) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Add windows_adjoin resource [#6981](https://github.com/chef/chef/pull/6981) ([tas50](https://github.com/tas50)) <!-- 14.0.159 -->
- Use the latest libarchive/bzip2 defs in omnibus [#7035](https://github.com/chef/chef/pull/7035) ([tas50](https://github.com/tas50)) <!-- 14.0.158 -->
- Suppress nested causes for sensitive exceptions [#7032](https://github.com/chef/chef/pull/7032) ([thommay](https://github.com/thommay)) <!-- 14.0.157 -->
- Add sysctl_param resource from the sysctl cookbook [#7022](https://github.com/chef/chef/pull/7022) ([tas50](https://github.com/tas50)) <!-- 14.0.156 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index d24d7db102..cda6f54277 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.158)
+ chef (14.0.159)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.158)
+ chef-config (= 14.0.159)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -39,10 +39,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.158-universal-mingw32)
+ chef (14.0.159-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.158)
+ chef-config (= 14.0.159)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -84,7 +84,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.158)
+ chef-config (14.0.159)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 9245c334a9..9cb7a30deb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.158 \ No newline at end of file
+14.0.159 \ 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 8eb346be97..9ac2184a5e 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 = "14.0.158"
+ VERSION = "14.0.159"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b8e4066629..bcd8c75625 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("14.0.158")
+ VERSION = Chef::VersionString.new("14.0.159")
end
#