summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-12 16:54:36 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-12 16:54:36 +0000
commit1ad26304b4793367a62c9b2544a680dde14bd1e8 (patch)
tree4481ec06f42e88abcb3d686a11886215ec1a05e9
parent15e2654625c52f3b8146ee1aa004ad9a045fd6b3 (diff)
downloadchef-1ad26304b4793367a62c9b2544a680dde14bd1e8.tar.gz
Bump version to 14.0.123 by Expeditorv14.0.123
-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 b73c60d705..d5bb710b70 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.122 -->
-## [v14.0.122](https://github.com/chef/chef/tree/v14.0.122) (2018-03-09)
+<!-- latest_release 14.0.123 -->
+## [v14.0.123](https://github.com/chef/chef/tree/v14.0.123) (2018-03-12)
#### Merged Pull Requests
-- New interop between Chef and PowerShell 4.0 (or higher) [#6941](https://github.com/chef/chef/pull/6941) ([stuartpreston](https://github.com/stuartpreston))
+- Remove the manpages [#6974](https://github.com/chef/chef/pull/6974) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Remove the manpages [#6974](https://github.com/chef/chef/pull/6974) ([tas50](https://github.com/tas50)) <!-- 14.0.123 -->
- New interop between Chef and PowerShell 4.0 (or higher) [#6941](https://github.com/chef/chef/pull/6941) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.0.122 -->
- Rename bff provider to match its resource [#6956](https://github.com/chef/chef/pull/6956) ([tas50](https://github.com/tas50)) <!-- 14.0.121 -->
- Convert more set_or_returns to proper properties [#6950](https://github.com/chef/chef/pull/6950) ([tas50](https://github.com/tas50)) <!-- 14.0.120 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 3be4fd6b6a..5216ebaa0d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 20305d8791869f36b7c54558e3c631e0c508ecc5
+ revision: df58c0ea31653c9ca601ce4154fc964946b27455
branch: master
specs:
- ohai (14.0.23)
+ ohai (14.0.25)
chef-config (>= 12.8, < 15)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.122)
+ chef (14.0.123)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.122)
+ chef-config (= 14.0.123)
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.122-universal-mingw32)
+ chef (14.0.123-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.122)
+ chef-config (= 14.0.123)
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.122)
+ chef-config (14.0.123)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 00b00895ff..45c84f0cc7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.122 \ No newline at end of file
+14.0.123 \ 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 90624445ac..b914014bb6 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.122"
+ VERSION = "14.0.123"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index fb962c2db0..74f2a752c8 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.122")
+ VERSION = Chef::VersionString.new("14.0.123")
end
#