diff --git a/CHANGELOG.md b/CHANGELOG.md index ea550fa64..e7aef749c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ # Change Log - -## [v4.18.73](https://github.com/inspec/inspec/tree/v4.18.73) (2020-01-30) + +## [v4.18.74](https://github.com/inspec/inspec/tree/v4.18.74) (2020-01-30) #### Merged Pull Requests -- bad master merge... rushing this through [#4871](https://github.com/inspec/inspec/pull/4871) ([zenspider](https://github.com/zenspider)) +- the correct, un-panicked fix. [#4872](https://github.com/inspec/inspec/pull/4872) ([zenspider](https://github.com/zenspider)) @@ -19,6 +19,7 @@ - upstream is basic_auth_only not basic_auth [#4834](https://github.com/inspec/inspec/pull/4834) ([shawnifoley](https://github.com/shawnifoley)) #### Merged Pull Requests +- the correct, un-panicked fix. [#4872](https://github.com/inspec/inspec/pull/4872) ([zenspider](https://github.com/zenspider)) - bad master merge... rushing this through [#4871](https://github.com/inspec/inspec/pull/4871) ([zenspider](https://github.com/zenspider)) - Add support for yocto linux in service resource [#4843](https://github.com/inspec/inspec/pull/4843) ([michaellihs](https://github.com/michaellihs)) - Fix up the platform on etc_hosts, virtualization, ini, and xml resources to fix OS disparity. [#4862](https://github.com/inspec/inspec/pull/4862) ([zenspider](https://github.com/zenspider)) diff --git a/VERSION b/VERSION index 737a77f49..5678958ab 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.18.73 \ No newline at end of file +4.18.74 \ No newline at end of file diff --git a/inspec-bin/lib/inspec-bin/version.rb b/inspec-bin/lib/inspec-bin/version.rb index b06b399ec..f808dd73e 100644 --- a/inspec-bin/lib/inspec-bin/version.rb +++ b/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.18.73".freeze + VERSION = "4.18.74".freeze end diff --git a/lib/inspec/version.rb b/lib/inspec/version.rb index a6a161098..e85610138 100644 --- a/lib/inspec/version.rb +++ b/lib/inspec/version.rb @@ -1,3 +1,3 @@ module Inspec - VERSION = "4.18.73".freeze + VERSION = "4.18.74".freeze end