summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-05 18:56:03 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-05 18:56:03 +0000
commit5a4031299e9d74bfb500522801fa2fc8d0ffc8e1 (patch)
tree1ce9cffec824e00c8d35e6850329197b4ae3f959
parentc70692dd8c030ac33b3b4071a0ec0515e94b89f5 (diff)
downloadchef-5a4031299e9d74bfb500522801fa2fc8d0ffc8e1.tar.gz
Bump version to 14.0.115 by Expeditorv14.0.115
-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 262dc170ce..fd6494e52f 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.114 -->
-## [v14.0.114](https://github.com/chef/chef/tree/v14.0.114) (2018-03-05)
+<!-- latest_release 14.0.115 -->
+## [v14.0.115](https://github.com/chef/chef/tree/v14.0.115) (2018-03-05)
#### Merged Pull Requests
-- add a utility to dump info about resources [#6896](https://github.com/chef/chef/pull/6896) ([thommay](https://github.com/thommay))
+- Remove support for Windows 2003 [#6923](https://github.com/chef/chef/pull/6923) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Remove support for Windows 2003 [#6923](https://github.com/chef/chef/pull/6923) ([tas50](https://github.com/tas50)) <!-- 14.0.115 -->
- add a utility to dump info about resources [#6896](https://github.com/chef/chef/pull/6896) ([thommay](https://github.com/thommay)) <!-- 14.0.114 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 24db7db018..ea7c8cd09e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.114)
+ chef (14.0.115)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.114)
+ chef-config (= 14.0.115)
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.114-universal-mingw32)
+ chef (14.0.115-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.114)
+ chef-config (= 14.0.115)
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.114)
+ chef-config (14.0.115)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 6768d6eb1f..fcacd05d63 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.114 \ No newline at end of file
+14.0.115 \ 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 2f5a165bb5..87f0700ee0 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.114"
+ VERSION = "14.0.115"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 6a2c936c80..74f05087ed 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.114")
+ VERSION = Chef::VersionString.new("14.0.115")
end
#