summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-07-23 16:53:32 +0000
committerChef Expeditor <chef-ci@chef.io>2019-07-23 16:53:32 +0000
commitbb05f9d90543b300103b287588480c8c9b440b0b (patch)
tree41c6dbd063bcd5391178203f6e6b0f145edc53d6
parentbbbb5910f659b6774d004f0425a6594104c65565 (diff)
downloadchef-bb05f9d90543b300103b287588480c8c9b440b0b.tar.gz
Bump version to 15.2.1 by Chef Expeditorv15.2.1
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-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--lib/chef/version.rb2
6 files changed, 15 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b61814e090..0e616e33d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.2.0 -->
-## [v15.2.0](https://github.com/chef/chef/tree/v15.2.0) (2019-07-22)
+<!-- latest_release 15.2.1 -->
+## [v15.2.1](https://github.com/chef/chef/tree/v15.2.1) (2019-07-23)
#### Merged Pull Requests
-- Bump InSpec, Ohai, and appbundler to the latest [#8761](https://github.com/chef/chef/pull/8761) ([tas50](https://github.com/tas50))
+- Move chef-client and chef-solo shared code into a base class and remove duplication and skew [#8744](https://github.com/chef/chef/pull/8744) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=15.1.36 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Move chef-client and chef-solo shared code into a base class and remove duplication and skew [#8744](https://github.com/chef/chef/pull/8744) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.2.1 -->
- Bump InSpec, Ohai, and appbundler to the latest [#8761](https://github.com/chef/chef/pull/8761) ([tas50](https://github.com/tas50)) <!-- 15.2.0 -->
- Implement disable for disabling kernel_modules [#8747](https://github.com/chef/chef/pull/8747) ([tomdoherty](https://github.com/tomdoherty)) <!-- 15.1.58 -->
- Add rspec testing on Fedora in Buildkite [#8759](https://github.com/chef/chef/pull/8759) ([tas50](https://github.com/tas50)) <!-- 15.1.57 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index e52788a5cc..0112c1dce1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.2.0)
+ chef (15.2.1)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.2.0)
+ chef-config (= 15.2.1)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -57,11 +57,11 @@ PATH
train-core (~> 2.0, >= 2.0.12)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.2.0-universal-mingw32)
+ chef (15.2.1-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.2.0)
+ chef-config (= 15.2.1)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -103,13 +103,13 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.2.0)
- chef (= 15.2.0)
+ chef-bin (15.2.1)
+ chef (= 15.2.1)
PATH
remote: chef-config
specs:
- chef-config (15.2.0)
+ chef-config (15.2.1)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index aa646ce59e..0c9d1ec658 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.2.0 \ No newline at end of file
+15.2.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 6635a5f81a..bc31b8a5ec 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.2.0".freeze
+ VERSION = "15.2.1".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 5aa531dc55..4e69506c2f 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.2.0".freeze
+ VERSION = "15.2.1".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f20302a73c..b903608de6 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.2.0")
+ VERSION = Chef::VersionString.new("15.2.1")
end
#