summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-01-08 15:34:16 +0000
committerChef Expeditor <expeditor@chef.io>2020-01-08 15:34:16 +0000
commitcd547928cb7f517b6fbd5e3a1e01ae9bfd2e4993 (patch)
tree3c7d996033953a0b87d9b8dbaa9393a91f56ac4f
parent64c8478b21bfa17b8b43031d6d2233e2f99ba7b5 (diff)
downloadchef-cd547928cb7f517b6fbd5e3a1e01ae9bfd2e4993.tar.gz
Bump version to 15.7.5 by Chef Expeditorv15.7.5
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock24
-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, 21 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b8320f7bc..82207b338a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.7.4 -->
-## [v15.7.4](https://github.com/chef/chef/tree/v15.7.4) (2019-12-30)
+<!-- latest_release 15.7.5 -->
+## [v15.7.5](https://github.com/chef/chef/tree/v15.7.5) (2020-01-08)
#### Merged Pull Requests
-- Bump chef-vault to 4.0.1, chef-zero to 14.0.17, mixlib-shellout to 3.0.9, and mixlib-authentication to 3.0.6 [#9198](https://github.com/chef/chef/pull/9198) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot]))
+- Last batch of wordmarks removal for chef-config [#9176](https://github.com/chef/chef/pull/9176) ([bobchaos](https://github.com/bobchaos))
<!-- latest_release -->
<!-- release_rollup since=15.6.10 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Last batch of wordmarks removal for chef-config [#9176](https://github.com/chef/chef/pull/9176) ([bobchaos](https://github.com/bobchaos)) <!-- 15.7.5 -->
- Bump chef-vault to 4.0.1, chef-zero to 14.0.17, mixlib-shellout to 3.0.9, and mixlib-authentication to 3.0.6 [#9198](https://github.com/chef/chef/pull/9198) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 15.7.4 -->
- Bump mixlib-archive to 1.0.5 [#9196](https://github.com/chef/chef/pull/9196) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 15.7.3 -->
- Bump ffi-yajl to 2.3.3 [#9195](https://github.com/chef/chef/pull/9195) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 15.7.2 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 2fd57a2511..78afcd3a8c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.7.4)
+ chef (15.7.5)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.7.4)
- chef-utils (= 15.7.4)
+ chef-config (= 15.7.5)
+ chef-utils (= 15.7.5)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -59,12 +59,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.7.4-universal-mingw32)
+ chef (15.7.5-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.7.4)
- chef-utils (= 15.7.4)
+ chef-config (= 15.7.5)
+ chef-utils (= 15.7.5)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -107,15 +107,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.7.4)
- chef (= 15.7.4)
+ chef-bin (15.7.5)
+ chef (= 15.7.5)
PATH
remote: chef-config
specs:
- chef-config (15.7.4)
+ chef-config (15.7.5)
addressable
- chef-utils (= 15.7.4)
+ chef-utils (= 15.7.5)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -124,7 +124,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (15.7.4)
+ chef-utils (15.7.5)
GEM
remote: https://rubygems.org/
@@ -362,7 +362,7 @@ GEM
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 3.0)
net-ssh (>= 2.9, < 6.0)
- train-winrm (0.2.5)
+ train-winrm (0.2.6)
winrm (~> 2.0)
winrm-fs (~> 1.0)
tty-box (0.5.0)
diff --git a/VERSION b/VERSION
index 1ca44d7bd3..fde6f99b3c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.7.4 \ No newline at end of file
+15.7.5 \ 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 e4c22e3306..a0a9bd5824 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 = "15.7.4".freeze
+ VERSION = "15.7.5".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 34c428aa04..5233487793 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 = "15.7.4".freeze
+ VERSION = "15.7.5".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index e90ec8301a..4add31060d 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 = "15.7.4".freeze
+ VERSION = "15.7.5".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 54a7ce8d61..5d5d139729 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("15.7.4")
+ VERSION = Chef::VersionString.new("15.7.5")
end
#