diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 12 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
5 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b7bf5bb3c9..866106fc48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.1.35 --> -## [v14.1.35](https://github.com/chef/chef/tree/v14.1.35) (2018-06-04) +<!-- latest_release 14.1.36 --> +## [v14.1.36](https://github.com/chef/chef/tree/v14.1.36) (2018-06-04) #### Merged Pull Requests -- Use inspec-core, new ffi gem, and bump deps [#7332](https://github.com/chef/chef/pull/7332) ([lamont-granquist](https://github.com/lamont-granquist)) +- bump ohai to 14.2.0 [#7333](https://github.com/chef/chef/pull/7333) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup since=14.1.12 --> ### Changes since 14.1.12 release #### Merged Pull Requests +- bump ohai to 14.2.0 [#7333](https://github.com/chef/chef/pull/7333) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.1.36 --> - Use inspec-core, new ffi gem, and bump deps [#7332](https://github.com/chef/chef/pull/7332) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.1.35 --> - Quote git remote_url property (PR 6249 + chefstyle fix) [#7014](https://github.com/chef/chef/pull/7014) ([tas50](https://github.com/tas50)) <!-- 14.1.34 --> - Allow securable resource tests to work on Windows 10 machines connected to an Azure Active Directory [#7301](https://github.com/chef/chef/pull/7301) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.1.33 --> diff --git a/Gemfile.lock b/Gemfile.lock index 329dcaef1c..a081b08f8f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,10 @@ GIT PATH remote: . specs: - chef (14.1.35) + chef (14.1.36) addressable bundler (>= 1.10) - chef-config (= 14.1.35) + chef-config (= 14.1.36) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -40,10 +40,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.1.35-universal-mingw32) + chef (14.1.36-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.1.35) + chef-config (= 14.1.36) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -86,7 +86,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.1.35) + chef-config (14.1.36) addressable fuzzyurl mixlib-config (~> 2.0) @@ -204,7 +204,7 @@ GEM netrc (0.11.0) octokit (4.9.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (14.2.0) + ohai (14.1.3) chef-config (>= 12.8, < 15) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -1 +1 @@ -14.1.35
\ No newline at end of file +14.1.36
\ 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 7eb8ddc7cb..f882bbd16b 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 = "14.1.35" + VERSION = "14.1.36" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 80e9ac1ed6..a3c9e998b7 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("14.1.35") + VERSION = Chef::VersionString.new("14.1.36") end # |