summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-09 12:53:54 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-09 12:53:54 +0000
commit7bcbad36612e48d1f53fc40e3b634ebcb12a9e93 (patch)
treeed64b9a24910e1f95b7c4405592568d9cc93252b
parent5bb5333d80b8c0d1cf82b0b867beff61fbfdfe2a (diff)
downloadchef-7bcbad36612e48d1f53fc40e3b634ebcb12a9e93.tar.gz
Bump version to 13.7.21 by Expeditorv13.7.21
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock20
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 17 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index be61d890c2..9f5dd1883e 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.20 -->
-## [v13.7.20](https://github.com/chef/chef/tree/v13.7.20) (2018-01-31)
+<!-- latest_release 13.7.21 -->
+## [v13.7.21](https://github.com/chef/chef/tree/v13.7.21) (2018-02-09)
#### 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))
+- Use the version of LicenseScout that comes with the Omnibus gem. [#6841](https://github.com/chef/chef/pull/6841) ([tduffield](https://github.com/tduffield))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Use the version of LicenseScout that comes with the Omnibus gem. [#6841](https://github.com/chef/chef/pull/6841) ([tduffield](https://github.com/tduffield)) <!-- 13.7.21 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 37b926cc50..8fc97bfd2c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.7.20)
+ chef (13.7.21)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.20)
+ chef-config (= 13.7.21)
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.20-universal-mingw32)
+ chef (13.7.21-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.20)
+ chef-config (= 13.7.21)
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.20)
+ chef-config (13.7.21)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -138,9 +138,9 @@ GEM
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
- ffi (1.9.18)
- ffi (1.9.18-x64-mingw32)
- ffi (1.9.18-x86-mingw32)
+ ffi (1.9.21)
+ ffi (1.9.21-x64-mingw32)
+ ffi (1.9.21-x86-mingw32)
ffi-win32-extensions (1.0.3)
ffi
ffi-yajl (2.3.1)
@@ -256,7 +256,7 @@ GEM
pusher-client (0.6.2)
json
websocket (~> 1.0)
- rack (2.0.3)
+ rack (2.0.4)
rainbow (2.2.2)
rake
rake (12.3.0)
@@ -309,7 +309,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
- specinfra (2.73.1)
+ specinfra (2.73.2)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
diff --git a/VERSION b/VERSION
index 50d9f509e2..3878e02c6c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.7.20 \ No newline at end of file
+13.7.21 \ 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 d54f7a740d..ce5ead9078 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.20"
+ VERSION = "13.7.21"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 385934c960..2fd849a499 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.20")
+ VERSION = Chef::VersionString.new("13.7.21")
end
#