summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-11-05 18:53:03 +0000
committerChef Expeditor <chef-ci@chef.io>2018-11-05 18:53:03 +0000
commitd49eaf2c59d5f5f67548ed5298ca6d7fd026dbe5 (patch)
tree3cbfb06226774af211698c6705b6e0c117d90257
parent731e30fb9e51b1cc369b8131e0b74a02f3776191 (diff)
downloadchef-d49eaf2c59d5f5f67548ed5298ca6d7fd026dbe5.tar.gz
Bump version to 14.7.12 by Chef Expeditorv14.7.12
Obvious fix; these changes are the result of automation not creative thinking.
-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 0d247478e6..78b075409b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.7.11 -->
-## [v14.7.11](https://github.com/chef/chef/tree/v14.7.11) (2018-11-05)
+<!-- latest_release 14.7.12 -->
+## [v14.7.12](https://github.com/chef/chef/tree/v14.7.12) (2018-11-05)
#### Merged Pull Requests
-- Backport: Make knife command banners consistent [#7874](https://github.com/chef/chef/pull/7874) ([tas50](https://github.com/tas50))
+- Add more validation_messages to properties [#7875](https://github.com/chef/chef/pull/7875) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.6.47 -->
### Changes since 14.6.47 release
#### Merged Pull Requests
+- Add more validation_messages to properties [#7875](https://github.com/chef/chef/pull/7875) ([tas50](https://github.com/tas50)) <!-- 14.7.12 -->
- Backport: Make knife command banners consistent [#7874](https://github.com/chef/chef/pull/7874) ([tas50](https://github.com/tas50)) <!-- 14.7.11 -->
- Backport: Add default_descriptions to properties [#7873](https://github.com/chef/chef/pull/7873) ([tas50](https://github.com/tas50)) <!-- 14.7.10 -->
- Backport: Added `description` property on windows_task resource [#7848](https://github.com/chef/chef/pull/7848) ([btm](https://github.com/btm)) <!-- 14.7.9 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 84faebe4db..e8e09d5edc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.7.11)
+ chef (14.7.12)
addressable
bundler (>= 1.10)
- chef-config (= 14.7.11)
+ chef-config (= 14.7.12)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -39,10 +39,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.7.11-universal-mingw32)
+ chef (14.7.12-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.7.11)
+ chef-config (= 14.7.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.7.11)
+ chef-config (14.7.12)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 1f918dadff..86ecfe27e6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.7.11 \ No newline at end of file
+14.7.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 4aa86d29a9..d38cc56a80 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.7.11".freeze
+ VERSION = "14.7.12".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index c94abdd67d..9e61f647d5 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.7.11")
+ VERSION = Chef::VersionString.new("14.7.12")
end
#