summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-06-23 15:49:58 +0000
committerChef Expeditor <expeditor@chef.io>2020-06-23 15:49:58 +0000
commit461ec1574d59780dfc91bd3b0520072221fb216d (patch)
treed38598f391de253ed379b770baa127c5f5ba26b3
parenta461a1f4c5ad3df99240b5aa3e8ebb0b679700c5 (diff)
downloadchef-15.12.1.tar.gz
Bump version to 15.12.1 by Chef Expeditorv15.12.1
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 10b0b26650..09bc6f0b6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.12.0 -->
-## [v15.12.0](https://github.com/chef/chef/tree/v15.12.0) (2020-06-23)
+<!-- latest_release 15.12.1 -->
+## [v15.12.1](https://github.com/chef/chef/tree/v15.12.1) (2020-06-23)
#### Merged Pull Requests
-- Update Ruby in Expeditor to 2.6.6 [#10034](https://github.com/chef/chef/pull/10034) ([tas50](https://github.com/tas50))
+- hostname: Improve the windows reboot message [#10031](https://github.com/chef/chef/pull/10031) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.11.8 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- hostname: Improve the windows reboot message [#10031](https://github.com/chef/chef/pull/10031) ([tas50](https://github.com/tas50)) <!-- 15.12.1 -->
- Update Ruby in Expeditor to 2.6.6 [#10034](https://github.com/chef/chef/pull/10034) ([tas50](https://github.com/tas50)) <!-- 15.12.0 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index d41993ca3b..16f2e1c7a0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.12.0)
+ chef (15.12.1)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.12.0)
- chef-utils (= 15.12.0)
+ chef-config (= 15.12.1)
+ chef-utils (= 15.12.1)
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.12.0-universal-mingw32)
+ chef (15.12.1-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.12.0)
- chef-utils (= 15.12.0)
+ chef-config (= 15.12.1)
+ chef-utils (= 15.12.1)
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.12.0)
- chef (= 15.12.0)
+ chef-bin (15.12.1)
+ chef (= 15.12.1)
PATH
remote: chef-config
specs:
- chef-config (15.12.0)
+ chef-config (15.12.1)
addressable
- chef-utils (= 15.12.0)
+ chef-utils (= 15.12.1)
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.12.0)
+ chef-utils (15.12.1)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 328dd37f09..e48badc229 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.12.0 \ No newline at end of file
+15.12.1 \ 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 77730b27e9..841aafd3c5 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.12.0".freeze
+ VERSION = "15.12.1".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 3b2d38ee27..f4f22dc8a7 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.12.0".freeze
+ VERSION = "15.12.1".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 72694f901b..8fc4a67962 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.12.0".freeze
+ VERSION = "15.12.1".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4c85fecd1e..2026bc1b2d 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.12.0")
+ VERSION = Chef::VersionString.new("15.12.1")
end
#