summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-09-16 18:39:57 +0000
committerChef Expeditor <expeditor@chef.io>2019-09-16 18:39:57 +0000
commit051b2d704dc3b11170d15f5d6a55a9142bf867ce (patch)
tree843dc868c8b1f12cb372f0830d1ab5e1259150b0
parented4337afebf7ca207aca78f44dd83e5b9395baf4 (diff)
downloadchef-051b2d704dc3b11170d15f5d6a55a9142bf867ce.tar.gz
Bump version to 15.4.0 by Chef Expeditor
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 8747dfd369..66d695ee73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.3.15 -->
-## [v15.3.15](https://github.com/chef/chef/tree/v15.3.15) (2019-09-14)
+<!-- latest_release 15.4.0 -->
+## [v15.4.0](https://github.com/chef/chef/tree/v15.4.0) (2019-09-16)
#### Merged Pull Requests
-- 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))
+- Add more resource examples to the codebase [#8868](https://github.com/chef/chef/pull/8868) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.3.14 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- 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 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index e6ac200e94..ce176fe06e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.3.15)
+ chef (15.4.0)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.3.15)
+ chef-config (= 15.4.0)
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.3.15-universal-mingw32)
+ chef (15.4.0-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.3.15)
+ chef-config (= 15.4.0)
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.3.15)
- chef (= 15.3.15)
+ chef-bin (15.4.0)
+ chef (= 15.4.0)
PATH
remote: chef-config
specs:
- chef-config (15.3.15)
+ chef-config (15.4.0)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 5f7c69121f..92edc454ca 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.3.15 \ No newline at end of file
+15.4.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 db1bf1b530..879b3dd6fe 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.3.15".freeze
+ VERSION = "15.4.0".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 78cb7315f8..507fe05d87 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.3.15".freeze
+ VERSION = "15.4.0".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index aa315b9bfd..4e8abd9c2a 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.3.15")
+ VERSION = Chef::VersionString.new("15.4.0")
end
#