summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-17 00:02:31 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-17 00:02:31 +0000
commitdfb39611a27efd7451a170feb8489a1028b4eee4 (patch)
tree6e279b60e2f497d084c882115a75ffb64dcae303
parent42640eb657a517e1222dc4b9f4335365f58affb9 (diff)
downloadchef-dfb39611a27efd7451a170feb8489a1028b4eee4.tar.gz
Bump version to 14.0.140 by Expeditorv14.0.140
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab2b77ae7e..6cdb77b5d7 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.139 -->
-## [v14.0.139](https://github.com/chef/chef/tree/v14.0.139) (2018-03-16)
+<!-- latest_release 14.0.140 -->
+## [v14.0.140](https://github.com/chef/chef/tree/v14.0.140) (2018-03-17)
#### Merged Pull Requests
-- Revert &quot;Stripping out Authorization header on redirect to a different host [#6996](https://github.com/chef/chef/pull/6996) ([tas50](https://github.com/tas50))
+- Add the sudo resource from the sudo resource [#6979](https://github.com/chef/chef/pull/6979) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Add the sudo resource from the sudo resource [#6979](https://github.com/chef/chef/pull/6979) ([tas50](https://github.com/tas50)) <!-- 14.0.140 -->
- Revert &quot;Stripping out Authorization header on redirect to a different host [#6996](https://github.com/chef/chef/pull/6996) ([tas50](https://github.com/tas50)) <!-- 14.0.139 -->
- Use Chef omnibus def that includes libarchive [#6993](https://github.com/chef/chef/pull/6993) ([tas50](https://github.com/tas50)) <!-- 14.0.138 -->
- Yum refactor [#6540](https://github.com/chef/chef/pull/6540) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.137 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index ec566e7c85..5a31985ae4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 65b2ee96ae77a7498b21663181b9c524e1235e26
+ revision: 9a6842a19cc9d46ca9cc42af4bda5e9ca31a0dce
branch: master
specs:
- ohai (14.0.26)
+ ohai (14.0.27)
chef-config (>= 12.8, < 15)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.139)
+ chef (14.0.140)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.139)
+ chef-config (= 14.0.140)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -57,10 +57,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.139-universal-mingw32)
+ chef (14.0.140-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.139)
+ chef-config (= 14.0.140)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -102,7 +102,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.139)
+ chef-config (14.0.140)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index e6cb73f843..9c0f573cc1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.139 \ No newline at end of file
+14.0.140 \ 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 3451aa5a06..44b74e7ea9 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.139"
+ VERSION = "14.0.140"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e0a24ff384..212f4679c7 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.139")
+ VERSION = Chef::VersionString.new("14.0.140")
end
#