summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 ad19d6f411..b24678606c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,17 +2,18 @@
This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/).
-<!-- latest_release 15.14.11 -->
-## [v15.14.11](https://github.com/chef/chef/tree/v15.14.11) (2021-01-06)
+<!-- latest_release 15.15.0 -->
+## [v15.15.0](https://github.com/chef/chef/tree/v15.15.0) (2021-01-06)
#### Merged Pull Requests
-- Update InSpec 4.24.8, chef-vault 4.1, mixlibshellout 3.2, plist 3.6 [#10846](https://github.com/chef/chef/pull/10846) ([tas50](https://github.com/tas50))
+- Update the Docker file to use the RHEL 7 package [#10849](https://github.com/chef/chef/pull/10849) ([ramereth](https://github.com/ramereth))
<!-- latest_release -->
<!-- release_rollup since=15.14.0 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Update the Docker file to use the RHEL 7 package [#10849](https://github.com/chef/chef/pull/10849) ([ramereth](https://github.com/ramereth)) <!-- 15.15.0 -->
- Update InSpec 4.24.8, chef-vault 4.1, mixlibshellout 3.2, plist 3.6 [#10846](https://github.com/chef/chef/pull/10846) ([tas50](https://github.com/tas50)) <!-- 15.14.11 -->
- locale: Update the locale-gen timeout to 1800s [#10844](https://github.com/chef/chef/pull/10844) ([tas50](https://github.com/tas50)) <!-- 15.14.10 -->
- Fix homebrew_cask for the new syntax [#10845](https://github.com/chef/chef/pull/10845) ([tas50](https://github.com/tas50)) <!-- 15.14.9 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 5684ebef6b..2fb2381fd7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -19,12 +19,12 @@ GIT
PATH
remote: .
specs:
- chef (15.14.11)
+ chef (15.15.0)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.14.11)
- chef-utils (= 15.14.11)
+ chef-config (= 15.15.0)
+ chef-utils (= 15.15.0)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -51,12 +51,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.14.11-universal-mingw32)
+ chef (15.15.0-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.14.11)
- chef-utils (= 15.14.11)
+ chef-config (= 15.15.0)
+ chef-utils (= 15.15.0)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -99,15 +99,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.14.11)
- chef (= 15.14.11)
+ chef-bin (15.15.0)
+ chef (= 15.15.0)
PATH
remote: chef-config
specs:
- chef-config (15.14.11)
+ chef-config (15.15.0)
addressable
- chef-utils (= 15.14.11)
+ chef-utils (= 15.15.0)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -116,7 +116,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (15.14.11)
+ chef-utils (15.15.0)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 46518f501e..7ea5a6f3ab 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.14.11 \ No newline at end of file
+15.15.0 \ 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 acd30aa4dc..d8d0c8b1ea 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("..", __dir__)
- VERSION = "15.14.11".freeze
+ VERSION = "15.15.0".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 46535c2f01..282df40986 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("..", __dir__)
- VERSION = "15.14.11".freeze
+ VERSION = "15.15.0".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 8cef805c9a..1677e96a6b 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("..", __dir__)
- VERSION = "15.14.11".freeze
+ VERSION = "15.15.0".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 364e765a4e..2abc23d861 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("..", __dir__)
- VERSION = Chef::VersionString.new("15.14.11")
+ VERSION = Chef::VersionString.new("15.15.0")
end
#