summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-06-13 18:56:44 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-06-13 18:56:44 +0000
commit12e679ac83758d9c4528b9c00a2a98ebde2cc714 (patch)
tree4486831631a36c4a954a1acb3e591c59bab0803b
parentd4a070975d361f231afe820f2b8140a30d0b8639 (diff)
downloadchef-12e679ac83758d9c4528b9c00a2a98ebde2cc714.tar.gz
Bump version to 14.3.12 by Chef Expeditorv14.3.12
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac0f7663b0..6cbcf32e79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.3.11 -->
-## [v14.3.11](https://github.com/chef/chef/tree/v14.3.11) (2018-06-13)
+<!-- latest_release 14.3.12 -->
+## [v14.3.12](https://github.com/chef/chef/tree/v14.3.12) (2018-06-13)
#### Merged Pull Requests
-- windows_feature_dism: Fix errors when specifying the source [#7370](https://github.com/chef/chef/pull/7370) ([tas50](https://github.com/tas50))
+- Add more property descriptions to resources [#7358](https://github.com/chef/chef/pull/7358) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.2.0 -->
### Changes since 14.2.0 release
#### Merged Pull Requests
+- Add more property descriptions to resources [#7358](https://github.com/chef/chef/pull/7358) ([tas50](https://github.com/tas50)) <!-- 14.3.12 -->
- windows_feature_dism: Fix errors when specifying the source [#7370](https://github.com/chef/chef/pull/7370) ([tas50](https://github.com/tas50)) <!-- 14.3.11 -->
- package: Make sure to use the package_name name properties [#7365](https://github.com/chef/chef/pull/7365) ([tas50](https://github.com/tas50)) <!-- 14.3.10 -->
- Add missing chef/resource requires in resource [#7364](https://github.com/chef/chef/pull/7364) ([tas50](https://github.com/tas50)) <!-- 14.3.9 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 17eef4d47a..5efdc34583 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.3.11)
+ chef (14.3.12)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.11)
+ chef-config (= 14.3.12)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.3.11-universal-mingw32)
+ chef (14.3.12-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.11)
+ chef-config (= 14.3.12)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.3.11)
+ chef-config (14.3.12)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 619ed6bb53..da3fc1ae95 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.3.11 \ No newline at end of file
+14.3.12 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index f6f6a291fb..0adac27343 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 = "14.3.11"
+ VERSION = "14.3.12"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 476fe70ec9..d265c68397 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("14.3.11")
+ VERSION = Chef::VersionString.new("14.3.12")
end
#