summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-06-24 06:26:56 +0000
committerChef Expeditor <expeditor@chef.io>2020-06-24 06:26:56 +0000
commitd0845f00e33890b290127168d1e9b07af3374769 (patch)
tree663386b683bd91f64d54956fa49a0b2411694def
parent8afc34172a1c8753127a6bb76107086558bbc6dc (diff)
downloadchef-d0845f00e33890b290127168d1e9b07af3374769.tar.gz
Bump version to 16.2.55 by Chef Expeditorv16.2.55
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md8
-rw-r--r--Gemfile.lock22
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/version.rb2
7 files changed, 20 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cba91a447..ea2683480a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.2.54 -->
-## [v16.2.54](https://github.com/chef/chef/tree/v16.2.54) (2020-06-24)
+<!-- latest_release 16.2.55 -->
+## [v16.2.55](https://github.com/chef/chef/tree/v16.2.55) (2020-06-24)
#### Merged Pull Requests
-- Bump diff-lcs to get bugfix. [#10057](https://github.com/chef/chef/pull/10057) ([phiggins](https://github.com/phiggins))
-- Setup cspell to pull from our common dictionary [#10021](https://github.com/chef/chef/pull/10021) ([tas50](https://github.com/tas50))
+- Inline some constants to prevent redefenition warnings in tests. [#10047](https://github.com/chef/chef/pull/10047) ([phiggins](https://github.com/phiggins))
<!-- latest_release -->
<!-- release_rollup since=16.2.50 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Inline some constants to prevent redefenition warnings in tests. [#10047](https://github.com/chef/chef/pull/10047) ([phiggins](https://github.com/phiggins)) <!-- 16.2.55 -->
- Bump diff-lcs to get bugfix. [#10057](https://github.com/chef/chef/pull/10057) ([phiggins](https://github.com/phiggins)) <!-- 16.2.54 -->
- Setup cspell to pull from our common dictionary [#10021](https://github.com/chef/chef/pull/10021) ([tas50](https://github.com/tas50)) <!-- 16.2.53 -->
- Fix broken tests after updating diff-lcs dep [#10052](https://github.com/chef/chef/pull/10052) ([phiggins](https://github.com/phiggins)) <!-- 16.2.52 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 06656dfecc..7caf515f6f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,12 +28,12 @@ GIT
PATH
remote: .
specs:
- chef (16.2.54)
+ chef (16.2.55)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.2.54)
- chef-utils (= 16.2.54)
+ chef-config (= 16.2.55)
+ chef-utils (= 16.2.55)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -62,12 +62,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (16.2.54-universal-mingw32)
+ chef (16.2.55-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.2.54)
- chef-utils (= 16.2.54)
+ chef-config (= 16.2.55)
+ chef-utils (= 16.2.55)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -112,15 +112,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (16.2.54)
- chef (= 16.2.54)
+ chef-bin (16.2.55)
+ chef (= 16.2.55)
PATH
remote: chef-config
specs:
- chef-config (16.2.54)
+ chef-config (16.2.55)
addressable
- chef-utils (= 16.2.54)
+ chef-utils (= 16.2.55)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -129,7 +129,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (16.2.54)
+ chef-utils (16.2.55)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index dc10e50a37..e87cffd37f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.2.54 \ No newline at end of file
+16.2.55 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index af40d5b5ba..4b4d067c2d 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "16.2.54".freeze
+ VERSION = "16.2.55".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 083a944f8b..9186087b8c 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "16.2.54".freeze
+ VERSION = "16.2.55".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index a9be8893f5..c0602a7cc1 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "16.2.54".freeze
+ VERSION = "16.2.55".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 21c4db8b14..bf1698801a 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("16.2.54")
+ VERSION = Chef::VersionString.new("16.2.55")
end
#