Merge branch 'master' of https://github.com/inspec/inspec into yt/wildcart_support_platform_name

.github/CODEOWNERS

@@ -1,5 +1,5 @@
 # Order is important. The last matching pattern has the most precedence.
 
 *                     @inspec/inspec-core-team
-docs-chef-io/**       @chef/docs-team @inspec/inspec-core-team
-*.md                  @chef/docs-team @inspec/inspec-core-team
+docs-chef-io/**       @inspec/inspec-core-team @chef/docs-team @mjingle @IanMadd
+*.md                  @inspec/inspec-core-team @chef/docs-team @mjingle @IanMadd

CHANGELOG.md

@@ -1,16 +1,18 @@
 # Change Log
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 4.23.18 -->
-## [v4.23.18](https://github.com/inspec/inspec/tree/v4.23.18) (2020-11-05)
+<!-- latest_release unreleased -->
+## Unreleased
 
 #### Merged Pull Requests
-- replace deprecated attributes section with inputs [#5295](https://github.com/inspec/inspec/pull/5295) ([KonradSchieban](https://github.com/KonradSchieban))
+- Update Codeowners file for Docs [#5298](https://github.com/inspec/inspec/pull/5298) ([mjingle](https://github.com/mjingle))
 <!-- latest_release -->
 
 <!-- release_rollup since=4.23.15 -->
 ### Changes since 4.23.15 release
 
 #### Merged Pull Requests
+- Update Codeowners file for Docs [#5298](https://github.com/inspec/inspec/pull/5298) ([mjingle](https://github.com/mjingle)) <!-- 4.23.19 -->
+- Bumps parallel for ruby 2.4 issue [#5304](https://github.com/inspec/inspec/pull/5304) ([Schwad](https://github.com/Schwad)) <!-- 4.23.19 -->
 - replace deprecated attributes section with inputs [#5295](https://github.com/inspec/inspec/pull/5295) ([KonradSchieban](https://github.com/KonradSchieban)) <!-- 4.23.18 -->
 - Add ed25519 support to the habitat package [#5299](https://github.com/inspec/inspec/pull/5299) ([btm](https://github.com/btm)) <!-- 4.23.17 -->
 - Pin rspec to 3.9 [#5297](https://github.com/inspec/inspec/pull/5297) ([james-stocks](https://github.com/james-stocks)) <!-- 4.23.16 -->

VERSION

@@ -1 +1 @@
-4.23.18
+4.23.19

inspec-bin/lib/inspec-bin/version.rb

@@ -1,5 +1,5 @@
 # This file managed by automation - do not edit manually
 module InspecBin
   INSPECBIN_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "4.23.18".freeze
+  VERSION = "4.23.19".freeze
 end

inspec-core.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "hashie",             "~> 3.4"
   spec.add_dependency "mixlib-log",         "~> 3.0"
   spec.add_dependency "sslshake",           "~> 1.2"
-  spec.add_dependency "parallel",           "~> 1.9"
+  spec.add_dependency "parallel",           "~> 1.9", "< 1.20" # TODO: remove top pin when we drop 2.4 support
   spec.add_dependency "faraday",            ">= 0.9.0", "< 1.1"
   spec.add_dependency "tty-table",          "~> 0.10"
   spec.add_dependency "tty-prompt",         "~> 0.17"

lib/inspec/version.rb

@@ -1,3 +1,3 @@
 module Inspec
-  VERSION = "4.23.18".freeze
+  VERSION = "4.23.19".freeze
 end