diff --git a/CHANGELOG.md b/CHANGELOG.md index f73fb9d4a..26a5b497c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ # Change Log - -## [v4.4.35](https://github.com/inspec/inspec/tree/v4.4.35) (2019-05-19) + +## [v4.4.36](https://github.com/inspec/inspec/tree/v4.4.36) (2019-05-20) #### Merged Pull Requests -- Fixes a test interaction bug between installer and loader. [#4111](https://github.com/inspec/inspec/pull/4111) ([zenspider](https://github.com/zenspider)) +- json was required twice. [#4118](https://github.com/inspec/inspec/pull/4118) ([miah](https://github.com/miah)) @@ -19,6 +19,7 @@ - Add inspec-*-bin to the plugin filter list [#4018](https://github.com/inspec/inspec/pull/4018) ([clintoncwolfe](https://github.com/clintoncwolfe)) #### Merged Pull Requests +- json was required twice. [#4118](https://github.com/inspec/inspec/pull/4118) ([miah](https://github.com/miah)) - Fixes a test interaction bug between installer and loader. [#4111](https://github.com/inspec/inspec/pull/4111) ([zenspider](https://github.com/zenspider)) - This needed to be a flat_map because :profiles was an array. [#4110](https://github.com/inspec/inspec/pull/4110) ([zenspider](https://github.com/zenspider)) - Fix @unique_controls uninitialized warning [#4079](https://github.com/inspec/inspec/pull/4079) ([miah](https://github.com/miah)) diff --git a/VERSION b/VERSION index 1e645026c..addf6d98e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.4.35 \ No newline at end of file +4.4.36 \ 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 146883dfd..da60ded7d 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.4.35'.freeze + VERSION = '4.4.36'.freeze end diff --git a/lib/inspec/version.rb b/lib/inspec/version.rb index 0504142a8..fec210dc1 100644 --- a/lib/inspec/version.rb +++ b/lib/inspec/version.rb @@ -1,3 +1,3 @@ module Inspec - VERSION = '4.4.35'.freeze + VERSION = '4.4.36'.freeze end