summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-05 18:30:06 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-05 18:30:06 +0000
commit96ae775bb89753871c30311a113c2efa269a2d71 (patch)
treea205b51335266c2346c638a49897dbff1c5f8af6
parent68ae89fc8cb7022ce29eba917d4578cfedfb7a79 (diff)
downloadchef-96ae775bb89753871c30311a113c2efa269a2d71.tar.gz
Bump version to 14.0.112 by Expeditorv14.0.112
-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 f904b0a015..a537d05645 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.111 -->
-## [v14.0.111](https://github.com/chef/chef/tree/v14.0.111) (2018-03-05)
+<!-- latest_release 14.0.112 -->
+## [v14.0.112](https://github.com/chef/chef/tree/v14.0.112) (2018-03-05)
#### Merged Pull Requests
-- Add more description fields, style fixes, add missing requires [#6943](https://github.com/chef/chef/pull/6943) ([tas50](https://github.com/tas50))
+- Add attribute hoisting into core [#6927](https://github.com/chef/chef/pull/6927) ([jonlives](https://github.com/jonlives))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Add attribute hoisting into core [#6927](https://github.com/chef/chef/pull/6927) ([jonlives](https://github.com/jonlives)) <!-- 14.0.112 -->
- Add more description fields, style fixes, add missing requires [#6943](https://github.com/chef/chef/pull/6943) ([tas50](https://github.com/tas50)) <!-- 14.0.111 -->
- registry_key: Properly limit allowed values for architecture [#6947](https://github.com/chef/chef/pull/6947) ([tas50](https://github.com/tas50)) <!-- 14.0.110 -->
- Modernize provides in the portage_package resource [#6903](https://github.com/chef/chef/pull/6903) ([tas50](https://github.com/tas50)) <!-- 14.0.109 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 7a458ed531..0c05a5236b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.111)
+ chef (14.0.112)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.111)
+ chef-config (= 14.0.112)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -57,10 +57,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.111-universal-mingw32)
+ chef (14.0.112-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.111)
+ chef-config (= 14.0.112)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -102,7 +102,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.111)
+ chef-config (14.0.112)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index de679e3341..a5435229ce 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.111 \ No newline at end of file
+14.0.112 \ 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 e1f6222e2c..4f2e7bf459 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.0.111"
+ VERSION = "14.0.112"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 58419a194c..483e1c9a29 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.0.111")
+ VERSION = Chef::VersionString.new("14.0.112")
end
#