summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-05 18:38:59 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-05 18:38:59 +0000
commit68f4ac82bf48ff0ce3b502d79d0d3208fd61f4a6 (patch)
treee92b3c4e98dfb267f0d00b0e0f1c2dc0936feffa
parent41d69e2a5b2ff23488441b82f019b77b243dbdf7 (diff)
downloadchef-68f4ac82bf48ff0ce3b502d79d0d3208fd61f4a6.tar.gz
Bump version to 14.0.113 by Expeditorv14.0.113
-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 a537d05645..b7656a03cb 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.112 -->
-## [v14.0.112](https://github.com/chef/chef/tree/v14.0.112) (2018-03-05)
+<!-- latest_release 14.0.113 -->
+## [v14.0.113](https://github.com/chef/chef/tree/v14.0.113) (2018-03-05)
#### Merged Pull Requests
-- Add attribute hoisting into core [#6927](https://github.com/chef/chef/pull/6927) ([jonlives](https://github.com/jonlives))
+- Don&#39;t use supervisor process for one-shot / command-line runs [#6914](https://github.com/chef/chef/pull/6914) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Don&#39;t use supervisor process for one-shot / command-line runs [#6914](https://github.com/chef/chef/pull/6914) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.113 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 0c05a5236b..4f1bb7da94 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.112)
+ chef (14.0.113)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.112)
+ chef-config (= 14.0.113)
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.112-universal-mingw32)
+ chef (14.0.113-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.112)
+ chef-config (= 14.0.113)
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.112)
+ chef-config (14.0.113)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index a5435229ce..c1797d1207 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.112 \ No newline at end of file
+14.0.113 \ 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 4f2e7bf459..3e1fee2390 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.112"
+ VERSION = "14.0.113"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 483e1c9a29..ebe1a149b4 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.112")
+ VERSION = Chef::VersionString.new("14.0.113")
end
#