summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-31 02:18:32 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-31 02:18:32 +0000
commitea69e39fc924110c21ce1ef018555ee59cdb7a1e (patch)
treeaad770f6fad8609809c9d6d4c4f521a374daf3a2
parente1b721f4d05148edf3619383b9356be3e498436c (diff)
downloadchef-ea69e39fc924110c21ce1ef018555ee59cdb7a1e.tar.gz
Bump version to 13.7.20 by Expeditorv13.7.20
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea7c0bb3a9..be61d890c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.7.19 -->
-## [v13.7.19](https://github.com/chef/chef/tree/v13.7.19) (2018-01-26)
+<!-- latest_release 13.7.20 -->
+## [v13.7.20](https://github.com/chef/chef/tree/v13.7.20) (2018-01-31)
#### Merged Pull Requests
-- Ensure that we create a docker compatible ca-certs symlink [#6799](https://github.com/chef/chef/pull/6799) ([thommay](https://github.com/thommay))
+- Backport the powershell spec fix to get Appveyor green again [#6813](https://github.com/chef/chef/pull/6813) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Backport the powershell spec fix to get Appveyor green again [#6813](https://github.com/chef/chef/pull/6813) ([tas50](https://github.com/tas50)) <!-- 13.7.20 -->
- Ensure that we create a docker compatible ca-certs symlink [#6799](https://github.com/chef/chef/pull/6799) ([thommay](https://github.com/thommay)) <!-- 13.7.19 -->
- fix node assignment of ImmutableArrays to VividMashes/AttrArrays (Chef-13 backport) [#6791](https://github.com/chef/chef/pull/6791) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.7.18 -->
- Fix regression where message isn&#39;t an identity property in log resource [#6780](https://github.com/chef/chef/pull/6780) ([tas50](https://github.com/tas50)) <!-- 13.7.17 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 528a5dce52..37b926cc50 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.7.19)
+ chef (13.7.20)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.19)
+ chef-config (= 13.7.20)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -47,10 +47,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.7.19-universal-mingw32)
+ chef (13.7.20-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.19)
+ chef-config (= 13.7.20)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.7.19)
+ chef-config (13.7.20)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -276,7 +276,7 @@ GEM
rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
- rspec-support (3.7.0)
+ rspec-support (3.7.1)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
diff --git a/VERSION b/VERSION
index 30dd4c313f..50d9f509e2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.7.19 \ No newline at end of file
+13.7.20 \ 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 ab9e5b92f6..d54f7a740d 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.7.19"
+ VERSION = "13.7.20"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 37fc56482e..385934c960 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.7.19")
+ VERSION = Chef::VersionString.new("13.7.20")
end
#