summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-02 14:02:57 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-02 14:02:57 +0000
commita7fe493097aa9db7fef8da1eaf02681f165e7b9c (patch)
tree05b1f93f2b568f3414f373d89ee06e0f4e578ca0
parent06e36410b9d23666ceb2ce3023c1a0d0b6e63378 (diff)
downloadchef-a7fe493097aa9db7fef8da1eaf02681f165e7b9c.tar.gz
Bump version to 13.8.14 by Chef Expeditorv13.8.14
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87a78b8c88..a0511fc9aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.8.13 -->
-## [v13.8.13](https://github.com/chef/chef/tree/v13.8.13) (2018-04-09)
+<!-- latest_release 13.8.14 -->
+## [v13.8.14](https://github.com/chef/chef/tree/v13.8.14) (2018-05-02)
#### Merged Pull Requests
-- Bump dependencies to bring in Ohai 13.9 [#7135](https://github.com/chef/chef/pull/7135) ([tas50](https://github.com/tas50))
+- Windows MSI: files are now re-unzipped during repair mode (Backport to Chef 13) [#7112](https://github.com/chef/chef/pull/7112) ([stuartpreston](https://github.com/stuartpreston))
<!-- latest_release -->
<!-- release_rollup since=13.8.5 -->
### Changes since 13.8.5 release
#### Merged Pull Requests
+- Windows MSI: files are now re-unzipped during repair mode (Backport to Chef 13) [#7112](https://github.com/chef/chef/pull/7112) ([stuartpreston](https://github.com/stuartpreston)) <!-- 13.8.14 -->
- Bump dependencies to bring in Ohai 13.9 [#7135](https://github.com/chef/chef/pull/7135) ([tas50](https://github.com/tas50)) <!-- 13.8.13 -->
- partially revert 61e3d4bb: do not use properties for mount [#7031](https://github.com/chef/chef/pull/7031) ([thommay](https://github.com/thommay)) <!-- 13.8.12 -->
- Empty commit to trigger a release build [#7040](https://github.com/chef/chef/pull/7040) ([btm](https://github.com/btm)) <!-- 13.8.11 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 984bffdcbe..a90af77923 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (13.8.13)
+ chef (13.8.14)
addressable
bundler (>= 1.10)
- chef-config (= 13.8.13)
+ chef-config (= 13.8.14)
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 (13.8.13-universal-mingw32)
+ chef (13.8.14-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.8.13)
+ chef-config (= 13.8.14)
chef-zero (~> 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -84,7 +84,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.8.13)
+ chef-config (13.8.14)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -188,7 +188,7 @@ GEM
little-plugger (~> 1.1)
multi_json (~> 1.10)
method_source (0.9.0)
- mixlib-archive (0.4.1)
+ mixlib-archive (0.4.2)
mixlib-log
mixlib-authentication (1.4.2)
mixlib-cli (1.7.0)
@@ -252,7 +252,7 @@ GEM
pusher-client (0.6.2)
json
websocket (~> 1.0)
- rack (2.0.4)
+ rack (2.0.5)
rainbow (2.2.2)
rake
rake (12.3.1)
diff --git a/VERSION b/VERSION
index edb3b060b4..8d39a193e7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.8.13 \ No newline at end of file
+13.8.14 \ 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 267eec403e..b3ba1b18ee 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 = "13.8.13"
+ VERSION = "13.8.14"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 2a7e7492cb..70de6a2f66 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("13.8.13")
+ VERSION = Chef::VersionString.new("13.8.14")
end
#