summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-01-13 21:37:23 +0000
committerChef Expeditor <expeditor@chef.io>2020-01-13 21:37:23 +0000
commit407d9e76eaa2dc8e74a7252dc4b06a4422742c0d (patch)
tree319d0b60d4f46d469eef80e4fc7b4ac99ccf9fbd
parent5579b3699bd797fef42dbb29d1677432d8922975 (diff)
downloadchef-407d9e76eaa2dc8e74a7252dc4b06a4422742c0d.tar.gz
Bump version to 15.7.12 by Chef Expeditorv15.7.12
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-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, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22b4d5c6a7..1d5d5d25d2 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.11 -->
-## [v15.7.11](https://github.com/chef/chef/tree/v15.7.11) (2020-01-13)
+<!-- latest_release 15.7.12 -->
+## [v15.7.12](https://github.com/chef/chef/tree/v15.7.12) (2020-01-13)
#### Merged Pull Requests
-- Do not build Chef Infra Client on Windows 2008 R2 [#9203](https://github.com/chef/chef/pull/9203) ([tas50](https://github.com/tas50))
+- Update to license_scout 1.1.2 [#9212](https://github.com/chef/chef/pull/9212) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.6.10 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Update to license_scout 1.1.2 [#9212](https://github.com/chef/chef/pull/9212) ([tas50](https://github.com/tas50)) <!-- 15.7.12 -->
- Do not build Chef Infra Client on Windows 2008 R2 [#9203](https://github.com/chef/chef/pull/9203) ([tas50](https://github.com/tas50)) <!-- 15.7.11 -->
- Clear password flags when setting the password on aix [#9209](https://github.com/chef/chef/pull/9209) ([Triodes](https://github.com/Triodes)) <!-- 15.7.10 -->
- Fixes for sudo resource fails on 2nd converge when Cmnd_Alias is used [#9186](https://github.com/chef/chef/pull/9186) ([samshinde](https://github.com/samshinde)) <!-- 15.7.9 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 7f7a7ce269..b4f3bf2a26 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.7.11)
+ chef (15.7.12)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.7.11)
- chef-utils (= 15.7.11)
+ chef-config (= 15.7.12)
+ chef-utils (= 15.7.12)
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.11-universal-mingw32)
+ chef (15.7.12-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.7.11)
- chef-utils (= 15.7.11)
+ chef-config (= 15.7.12)
+ chef-utils (= 15.7.12)
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.11)
- chef (= 15.7.11)
+ chef-bin (15.7.12)
+ chef (= 15.7.12)
PATH
remote: chef-config
specs:
- chef-config (15.7.11)
+ chef-config (15.7.12)
addressable
- chef-utils (= 15.7.11)
+ chef-utils (= 15.7.12)
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.11)
+ chef-utils (15.7.12)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index b5de928f44..67d973d7a7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.7.11 \ No newline at end of file
+15.7.12 \ 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 95bce49ac6..0703277ca1 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.11".freeze
+ VERSION = "15.7.12".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 828294e98a..d516f4ae6c 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.11".freeze
+ VERSION = "15.7.12".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 9c0abcbcb2..7c042d3c93 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.11".freeze
+ VERSION = "15.7.12".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 2c773c2eef..02e0b76e73 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.11")
+ VERSION = Chef::VersionString.new("15.7.12")
end
#