summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-23 17:55:29 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-23 17:55:29 +0000
commit8adbc017e4ff12bf63e5bd0569a2993e12e4ea56 (patch)
tree023618ba38146a1dd8e7c7a89c2af972ca916aed
parent628461912bc6825af63ed7d45ad6b7ebbb6881da (diff)
downloadchef-8adbc017e4ff12bf63e5bd0569a2993e12e4ea56.tar.gz
Bump version to 14.0.161 by Expeditorv14.0.161
-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 3ba967c182..90d3276691 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.160 -->
-## [v14.0.160](https://github.com/chef/chef/tree/v14.0.160) (2018-03-23)
+<!-- latest_release 14.0.161 -->
+## [v14.0.161](https://github.com/chef/chef/tree/v14.0.161) (2018-03-23)
#### Merged Pull Requests
-- Fix a few bugs in the sudo resource [#7038](https://github.com/chef/chef/pull/7038) ([tas50](https://github.com/tas50))
+- Upgrade to openssl 1.1 [#7044](https://github.com/chef/chef/pull/7044) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Upgrade to openssl 1.1 [#7044](https://github.com/chef/chef/pull/7044) ([tas50](https://github.com/tas50)) <!-- 14.0.161 -->
- Fix a few bugs in the sudo resource [#7038](https://github.com/chef/chef/pull/7038) ([tas50](https://github.com/tas50)) <!-- 14.0.160 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 017a05ba2a..c54a608034 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.160)
+ chef (14.0.161)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.160)
+ chef-config (= 14.0.161)
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.160-universal-mingw32)
+ chef (14.0.161-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.160)
+ chef-config (= 14.0.161)
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.160)
+ chef-config (14.0.161)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 1b149a9537..936bad9616 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.160 \ No newline at end of file
+14.0.161 \ 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 c5a31a1d11..3a2d3c112c 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.160"
+ VERSION = "14.0.161"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b099cfffd5..e4d2b98eea 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.160")
+ VERSION = Chef::VersionString.new("14.0.161")
end
#