summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-09-18 18:04:31 +0000
committerChef Expeditor <expeditor@chef.io>2019-09-18 18:04:31 +0000
commit4e5908e297f26f19ad5da2cefaa46579db38d266 (patch)
tree0a2bde89a07deced8e97ea26e0a0cabf676cefd1
parent36770a10485ac87c22ef38c2c7e4750e6153dbd3 (diff)
downloadchef-4e5908e297f26f19ad5da2cefaa46579db38d266.tar.gz
Bump version to 15.4.2 by Chef Expeditorv15.4.2
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 02fee63267..4238bc36d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.5.1 -->
-## [v15.5.1](https://github.com/chef/chef/tree/v15.5.1) (2019-09-16)
+<!-- latest_release 15.4.2 -->
+## [v15.4.2](https://github.com/chef/chef/tree/v15.4.2) (2019-09-18)
#### Merged Pull Requests
-- kernel_module: Add new options property [#8887](https://github.com/chef/chef/pull/8887) ([ramereth](https://github.com/ramereth))
+- Fix for chocolatey_package fails using extra options [#8765](https://github.com/chef/chef/pull/8765) ([kapilchouhan99](https://github.com/kapilchouhan99))
<!-- latest_release -->
<!-- release_rollup since=15.3.14 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Fix for chocolatey_package fails using extra options [#8765](https://github.com/chef/chef/pull/8765) ([kapilchouhan99](https://github.com/kapilchouhan99)) <!-- 15.4.2 -->
- kernel_module: Add new options property [#8887](https://github.com/chef/chef/pull/8887) ([ramereth](https://github.com/ramereth)) <!-- 15.5.1 -->
- Add more resource examples to the codebase [#8868](https://github.com/chef/chef/pull/8868) ([tas50](https://github.com/tas50)) <!-- 15.4.0 -->
- Revert &quot;Drop privileges before creating files in solo mode&quot; [#8880](https://github.com/chef/chef/pull/8880) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.3.15 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index fc044139f7..a9925029ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.4.1)
+ chef (15.4.2)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.4.1)
+ chef-config (= 15.4.2)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -58,11 +58,11 @@ PATH
train-winrm
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.4.1-universal-mingw32)
+ chef (15.4.2-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.4.1)
+ chef-config (= 15.4.2)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -105,13 +105,13 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.4.1)
- chef (= 15.4.1)
+ chef-bin (15.4.2)
+ chef (= 15.4.2)
PATH
remote: chef-config
specs:
- chef-config (15.4.1)
+ chef-config (15.4.2)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 65d9b5b109..baec1bc73e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.4.1 \ No newline at end of file
+15.4.2 \ 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 51df34a5c6..6a14754084 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.4.1".freeze
+ VERSION = "15.4.2".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 2fcc3d6bc4..4d50f7f153 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.4.1".freeze
+ VERSION = "15.4.2".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 685929c22f..afe18aedfa 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.4.1")
+ VERSION = Chef::VersionString.new("15.4.2")
end
#