summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-07 19:09:37 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-07 19:09:37 +0000
commitd63980c156c042d2badcfc83b9dbe00c8e5cdccb (patch)
treef050f3dace84e8438617c285d90702c37a92455d
parent62dca7c0ff16aaf1ed860285e644cb2b6c8b0552 (diff)
downloadchef-d63980c156c042d2badcfc83b9dbe00c8e5cdccb.tar.gz
Bump version to 14.0.121 by Expeditorv14.0.121
-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 8bd6788819..16d0879972 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.120 -->
-## [v14.0.120](https://github.com/chef/chef/tree/v14.0.120) (2018-03-07)
+<!-- latest_release 14.0.121 -->
+## [v14.0.121](https://github.com/chef/chef/tree/v14.0.121) (2018-03-07)
#### Merged Pull Requests
-- Convert more set_or_returns to proper properties [#6950](https://github.com/chef/chef/pull/6950) ([tas50](https://github.com/tas50))
+- Rename bff provider to match its resource [#6956](https://github.com/chef/chef/pull/6956) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- 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 -->
- Remove explicit setting of @provider and depend on ProviderResolver [#6958](https://github.com/chef/chef/pull/6958) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- 14.0.119 -->
- remove deprecated property namespace collisions [#6952](https://github.com/chef/chef/pull/6952) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.118 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 882d28d5bf..7c2bf52d5b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.120)
+ chef (14.0.121)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.120)
+ chef-config (= 14.0.121)
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.120-universal-mingw32)
+ chef (14.0.121-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.120)
+ chef-config (= 14.0.121)
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.120)
+ chef-config (14.0.121)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 40e3c93203..71ca91d42e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.120 \ No newline at end of file
+14.0.121 \ 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 ae829e06f9..94609a93c7 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.120"
+ VERSION = "14.0.121"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d14fffe705..c7dc5c0b67 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.120")
+ VERSION = Chef::VersionString.new("14.0.121")
end
#