summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-16 17:24:18 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-16 17:24:18 +0000
commit7ed08da937734d168fbe4742f3617ab90b614da4 (patch)
tree68f2e44ff0096cabaf48a70c8590492ecf41e57d
parent010cdf628db33df3dc0be865c97e6e06e08de1fa (diff)
downloadchef-7ed08da937734d168fbe4742f3617ab90b614da4.tar.gz
Bump version to 14.0.138 by Expeditorv14.0.138
-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 ae781aeebd..871413cf45 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.137 -->
-## [v14.0.137](https://github.com/chef/chef/tree/v14.0.137) (2018-03-16)
+<!-- latest_release 14.0.138 -->
+## [v14.0.138](https://github.com/chef/chef/tree/v14.0.138) (2018-03-16)
#### Merged Pull Requests
-- Yum refactor [#6540](https://github.com/chef/chef/pull/6540) ([lamont-granquist](https://github.com/lamont-granquist))
+- Use Chef omnibus def that includes libarchive [#6993](https://github.com/chef/chef/pull/6993) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- 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 -->
- update mount to use properties and fix 6851 [#6969](https://github.com/chef/chef/pull/6969) ([thommay](https://github.com/thommay)) <!-- 14.0.136 -->
- Remove knife help which used the manpages [#6982](https://github.com/chef/chef/pull/6982) ([tas50](https://github.com/tas50)) <!-- 14.0.135 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 30b0e96dd5..311a503343 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.137)
+ chef (14.0.138)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.137)
+ chef-config (= 14.0.138)
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.137-universal-mingw32)
+ chef (14.0.138-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.137)
+ chef-config (= 14.0.138)
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.137)
+ chef-config (14.0.138)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index c61d967339..e54e070617 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.137 \ No newline at end of file
+14.0.138 \ 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 f5882af607..f43913d388 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.137"
+ VERSION = "14.0.138"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 32607e68a5..19090d96c8 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.137")
+ VERSION = Chef::VersionString.new("14.0.138")
end
#