summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-09-11 13:20:51 +0000
committerChef Expeditor <chef-ci@chef.io>2019-09-11 13:20:51 +0000
commit4919fe85ab22e4d45c3f172a4c6cec83eee80f48 (patch)
treea39e4e08f4916ef66dcd5b60366a35dc90203867
parent2744875f182b4a19fcaf822ae6aff86f0f184d9e (diff)
downloadchef-4919fe85ab22e4d45c3f172a4c6cec83eee80f48.tar.gz
Bump version to 15.3.12 by Chef Expeditorv15.3.12
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md9
-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, 16 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6fbe331d6..ad8822b8a8 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.11 -->
-## [v15.3.11](https://github.com/chef/chef/tree/v15.3.11) (2019-09-10)
+<!-- latest_release 15.3.12 -->
+## [v15.3.12](https://github.com/chef/chef/tree/v15.3.12) (2019-09-11)
#### Merged Pull Requests
-- Fix for user resource does not handle a gid specified as a string [#8869](https://github.com/chef/chef/pull/8869) ([kapilchouhan99](https://github.com/kapilchouhan99))
+- [macos] fix mac_user platform constraints [#8874](https://github.com/chef/chef/pull/8874) ([ryancragun](https://github.com/ryancragun))
<!-- latest_release -->
<!-- release_rollup since=15.2.20 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- [macos] fix mac_user platform constraints [#8874](https://github.com/chef/chef/pull/8874) ([ryancragun](https://github.com/ryancragun)) <!-- 15.3.12 -->
- Fix for user resource does not handle a gid specified as a string [#8869](https://github.com/chef/chef/pull/8869) ([kapilchouhan99](https://github.com/kapilchouhan99)) <!-- 15.3.11 -->
- Update Ruby to 2.6.4 and nokogori to 10.10.4 to resolve CVEs [#8851](https://github.com/chef/chef/pull/8851) ([tas50](https://github.com/tas50)) <!-- 15.4.0 -->
- Add mac_user resource that is compatible with macOS &gt;= 10.14 [#8775](https://github.com/chef/chef/pull/8775) ([ryancragun](https://github.com/ryancragun)) <!-- 15.3.9 -->
@@ -2893,4 +2894,4 @@ of partial templates.
* Fixed a bug where nested resources that inherited from Resource::LWRPBase
would not share the same actions/default_action as their parent
* Raise error if a guard_interpreter is specified and a block is passed to a guard (conditional)
-* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943)
+* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943) \ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index de5a7381d2..47e22b561e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.3.11)
+ chef (15.3.12)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.3.11)
+ chef-config (= 15.3.12)
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.11-universal-mingw32)
+ chef (15.3.12-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.3.11)
+ chef-config (= 15.3.12)
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.11)
- chef (= 15.3.11)
+ chef-bin (15.3.12)
+ chef (= 15.3.12)
PATH
remote: chef-config
specs:
- chef-config (15.3.11)
+ chef-config (15.3.12)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 02cba6181c..020ca0a63f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.3.11 \ No newline at end of file
+15.3.12 \ 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 63c7c94264..a5654637e5 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.11".freeze
+ VERSION = "15.3.12".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index efff472141..cec13052ef 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.11".freeze
+ VERSION = "15.3.12".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 1bc0f83693..3a9754a6ec 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.11")
+ VERSION = Chef::VersionString.new("15.3.12")
end
#