summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-06-23 18:41:44 +0000
committerChef Expeditor <expeditor@chef.io>2020-06-23 18:41:44 +0000
commitdc4cf76fded1d58af0ee7aca641081eeaf458347 (patch)
treebc8731cb7d1d97ac0fa54d6679bbfd2871a73f0e
parent0f743263d1a2d5388c900f911c5d4c930e1826aa (diff)
downloadchef-dc4cf76fded1d58af0ee7aca641081eeaf458347.tar.gz
Bump version to 15.12.14 by Chef Expeditorv15.12.14
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 901bc4fdf9..e7e793ff2a 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.13 -->
-## [v15.12.13](https://github.com/chef/chef/tree/v15.12.13) (2020-06-23)
+<!-- latest_release 15.12.14 -->
+## [v15.12.14](https://github.com/chef/chef/tree/v15.12.14) (2020-06-23)
#### Merged Pull Requests
-- Bump Ohai to 15.12 to support macOS Big Sur [#10046](https://github.com/chef/chef/pull/10046) ([tas50](https://github.com/tas50))
+- Use /etc/chef for bootstrapping instead of ChefConfig [#10044](https://github.com/chef/chef/pull/10044) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.11.8 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Use /etc/chef for bootstrapping instead of ChefConfig [#10044](https://github.com/chef/chef/pull/10044) ([tas50](https://github.com/tas50)) <!-- 15.12.14 -->
- Bump Ohai to 15.12 to support macOS Big Sur [#10046](https://github.com/chef/chef/pull/10046) ([tas50](https://github.com/tas50)) <!-- 15.12.13 -->
- Add Windows 8 Tester [#10045](https://github.com/chef/chef/pull/10045) ([tas50](https://github.com/tas50)) <!-- 15.12.12 -->
- Fix snap_package bugs [#10042](https://github.com/chef/chef/pull/10042) ([tas50](https://github.com/tas50)) <!-- 15.12.11 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index b642d28a0d..3ba655fed3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.12.13)
+ chef (15.12.14)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.12.13)
- chef-utils (= 15.12.13)
+ chef-config (= 15.12.14)
+ chef-utils (= 15.12.14)
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.13-universal-mingw32)
+ chef (15.12.14-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.12.13)
- chef-utils (= 15.12.13)
+ chef-config (= 15.12.14)
+ chef-utils (= 15.12.14)
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.13)
- chef (= 15.12.13)
+ chef-bin (15.12.14)
+ chef (= 15.12.14)
PATH
remote: chef-config
specs:
- chef-config (15.12.13)
+ chef-config (15.12.14)
addressable
- chef-utils (= 15.12.13)
+ chef-utils (= 15.12.14)
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.13)
+ chef-utils (15.12.14)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 2473151e57..609eb7b41b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.12.13 \ No newline at end of file
+15.12.14 \ 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 bfe85ac4f0..dd2b867465 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.13".freeze
+ VERSION = "15.12.14".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 8144953993..56a7007cfd 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.13".freeze
+ VERSION = "15.12.14".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 530a88f088..744bd3fb3a 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.13".freeze
+ VERSION = "15.12.14".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 9477830d03..33e4413cb2 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.13")
+ VERSION = Chef::VersionString.new("15.12.14")
end
#