summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock58
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--omnibus/Gemfile.lock16
9 files changed, 48 insertions, 47 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88185984ab..f7659459fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.5.4 -->
-## [v15.5.4](https://github.com/chef/chef/tree/v15.5.4) (2019-11-14)
+<!-- latest_release 15.5.5 -->
+## [v15.5.5](https://github.com/chef/chef/tree/v15.5.5) (2019-11-14)
#### Merged Pull Requests
-- Additional chef-utils helpers for rhel6/7/8 [#9095](https://github.com/chef/chef/pull/9095) ([lamont-granquist](https://github.com/lamont-granquist))
+- Update InSpec to 4.18 [#9096](https://github.com/chef/chef/pull/9096) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.4.45 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Update InSpec to 4.18 [#9096](https://github.com/chef/chef/pull/9096) ([tas50](https://github.com/tas50)) <!-- 15.5.5 -->
- Additional chef-utils helpers for rhel6/7/8 [#9095](https://github.com/chef/chef/pull/9095) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.5.4 -->
- Support multiple profiles in windows_firewall_rule [#8916](https://github.com/chef/chef/pull/8916) ([Happycoil](https://github.com/Happycoil)) <!-- 15.5.3 -->
- Update all deps to the latest including omnibus-software with faster Ruby [#9091](https://github.com/chef/chef/pull/9091) ([tas50](https://github.com/tas50)) <!-- 15.5.2 -->
diff --git a/Gemfile b/Gemfile
index 710aa25529..41fa898cef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,8 +26,8 @@ gem "cheffish", "~> 14"
group(:omnibus_package) do
gem "appbundler"
gem "rb-readline"
- gem "inspec-core", "~> 4.3"
- gem "inspec-core-bin", "~> 4.3" # need to provide the binaries for inspec
+ gem "inspec-core", "~> 4.18"
+ gem "inspec-core-bin", "~> 4.18" # need to provide the binaries for inspec
gem "chef-vault"
gem "ed25519" # ed25519 ssh key support done here as it's a native gem we can't put in train
gem "bcrypt_pbkdf" # ed25519 ssh key support done here as it's a native gem we can't put in train
diff --git a/Gemfile.lock b/Gemfile.lock
index 22b71628d1..45cb6c9c19 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.5.4)
+ chef (15.5.5)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.5.4)
- chef-utils (= 15.5.4)
+ chef-config (= 15.5.5)
+ chef-utils (= 15.5.5)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -59,12 +59,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.5.4-universal-mingw32)
+ chef (15.5.5-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.5.4)
- chef-utils (= 15.5.4)
+ chef-config (= 15.5.5)
+ chef-utils (= 15.5.5)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -107,15 +107,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.5.4)
- chef (= 15.5.4)
+ chef-bin (15.5.5)
+ chef (= 15.5.5)
PATH
remote: chef-config
specs:
- chef-config (15.5.4)
+ chef-config (15.5.5)
addressable
- chef-utils (= 15.5.4)
+ chef-utils (= 15.5.5)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -124,7 +124,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (15.5.4)
+ chef-utils (15.5.5)
GEM
remote: https://rubygems.org/
@@ -188,7 +188,7 @@ GEM
htmlentities (4.3.4)
httpclient (2.8.3)
iniparse (1.4.4)
- inspec-core (4.17.17)
+ inspec-core (4.18.38)
addressable (~> 2.4)
faraday (>= 0.9.0)
faraday_middleware (~> 0.12.2)
@@ -202,7 +202,7 @@ GEM
parallel (~> 1.9)
parslet (~> 1.5)
pry (~> 0)
- rspec (~> 3)
+ rspec (~> 3.0, < 3.9)
rspec-its (~> 1.2)
rubyzip (~> 1.1)
semverse
@@ -213,8 +213,8 @@ GEM
train-core (~> 3.0)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
- inspec-core-bin (4.17.17)
- inspec-core (= 4.17.17)
+ inspec-core-bin (4.18.38)
+ inspec-core (= 4.18.38)
ipaddress (0.8.3)
iso8601 (0.12.1)
jaro_winkler (1.5.4)
@@ -238,7 +238,7 @@ GEM
mixlib-log
mixlib-authentication (3.0.4)
mixlib-cli (2.1.1)
- mixlib-config (3.0.1)
+ mixlib-config (3.0.5)
tomlrb
mixlib-log (3.0.1)
mixlib-shellout (3.0.7)
@@ -285,22 +285,22 @@ GEM
rainbow (3.0.0)
rake (12.3.2)
rb-readline (0.5.5)
- rspec (3.9.0)
- rspec-core (~> 3.9.0)
- rspec-expectations (~> 3.9.0)
- rspec-mocks (~> 3.9.0)
- rspec-core (3.9.0)
- rspec-support (~> 3.9.0)
- rspec-expectations (3.9.0)
+ rspec (3.8.0)
+ rspec-core (~> 3.8.0)
+ rspec-expectations (~> 3.8.0)
+ rspec-mocks (~> 3.8.0)
+ rspec-core (3.8.2)
+ rspec-support (~> 3.8.0)
+ rspec-expectations (3.8.6)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.9.0)
+ rspec-support (~> 3.8.0)
rspec-its (1.3.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
- rspec-mocks (3.9.0)
+ rspec-mocks (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.9.0)
- rspec-support (3.9.0)
+ rspec-support (~> 3.8.0)
+ rspec-support (3.8.3)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
@@ -433,8 +433,8 @@ DEPENDENCIES
chefstyle!
ed25519
fauxhai-ng
- inspec-core (~> 4.3)
- inspec-core-bin (~> 4.3)
+ inspec-core (~> 4.18)
+ inspec-core-bin (~> 4.18)
ohai!
pry
pry-byebug
diff --git a/VERSION b/VERSION
index 63a3b0b00a..fa3cde5bf8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.5.4 \ No newline at end of file
+15.5.5 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 9d4513e3e4..8edb4dc6b6 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.5.4".freeze
+ VERSION = "15.5.5".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index afad60a403..11cf89e10d 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.5.4".freeze
+ VERSION = "15.5.5".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 381884704d..a0b89eaa55 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.5.4".freeze
+ VERSION = "15.5.5".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index faf63c17d6..a7f7cc3024 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.5.4")
+ VERSION = Chef::VersionString.new("15.5.5")
end
#
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 489912f2c4..13c8086a8e 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: f0e30edfaaaf47f403c441ddf6665b21a26f4546
+ revision: 97490bb29fc5203d32d9475b044807ecad3ef7ef
branch: master
specs:
- omnibus (6.1.13)
+ omnibus (6.1.14)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-sugar (>= 3.3)
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 1f1cec89d749593420a429baf182becf8741fe12
+ revision: 53ab4169b691367dc16a317fca4426fb6563a65a
branch: master
specs:
omnibus-software (4.0.0)
@@ -32,7 +32,7 @@ GEM
artifactory (3.0.5)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
- aws-partitions (1.239.0)
+ aws-partitions (1.240.0)
aws-sdk-core (3.77.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@@ -206,7 +206,7 @@ GEM
mixlib-log
mixlib-authentication (2.1.1)
mixlib-cli (2.1.1)
- mixlib-config (3.0.1)
+ mixlib-config (3.0.5)
tomlrb
mixlib-install (3.11.21)
mixlib-shellout
@@ -264,7 +264,7 @@ GEM
retryable (3.0.5)
ruby-progressbar (1.10.1)
rubyntlm (0.6.2)
- rubyzip (1.3.0)
+ rubyzip (2.0.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
@@ -359,10 +359,10 @@ GEM
erubi (~> 1.8)
winrm (~> 2.0)
winrm-fs (~> 1.0)
- winrm-fs (1.3.3)
+ winrm-fs (1.3.4)
erubi (~> 1.8)
logging (>= 1.6.1, < 3.0)
- rubyzip (~> 1.1)
+ rubyzip (~> 2.0)
winrm (~> 2.0)
wisper (2.0.1)
wmi-lite (1.0.2)
View Lorry Controller Status