Merge pull request #6456 from chef/tm/ohai_13_5

include ohai 13.5

3 files changed, 31 insertions, 22 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 2ec2895be1..eca346755e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -104,7 +104,6 @@ GEM
     addressable (2.4.0)
     appbundler (0.10.0)
       mixlib-cli (~> 1.4)
-      mixlib-shellout (~> 2.0)
     ast (2.3.0)
     backports (3.8.0)
     binding_of_caller (0.7.2)
@@ -194,7 +193,7 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    method_source (0.8.2)
+    method_source (0.9.0)
     mixlib-archive (0.4.1)
       mixlib-log
     mixlib-authentication (1.4.2)
@@ -224,7 +223,7 @@ GEM
     nori (2.6.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (13.4.0)
+    ohai (13.5.0)
       chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -244,9 +243,9 @@ GEM
     plist (3.3.0)
     powerpack (0.1.1)
     proxifier (1.0.3)
-    pry (0.11.0)
+    pry (0.11.1)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
+      method_source (~> 0.9.0)
     pry-byebug (3.5.0)
       byebug (~> 9.1)
       pry (~> 0.10)
@@ -291,7 +290,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-prof (0.16.2)
-    ruby-progressbar (1.8.3)
+    ruby-progressbar (1.9.0)
     ruby-shadow (2.5.0)
     rubyntlm (0.6.2)
     rubyzip (1.2.1)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 5eb3bc2b2b..3ffac73161 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -15,6 +15,18 @@ Windows cookbook.
 
 ## InSpec updated to 1.39.1
 
+## Ohai 13.5 Release Notes:
+
+### Correctly detect IPv6 routes ending in ::
+
+Previously we would ignore routes that ended `::`, and now we properly
+detect them.
+
+### Plugin run time is now measured
+
+Debug logs will show the length of time each plugin takes to run, making
+debugging of long ohai runs easier.
+
 # Chef Client Release Notes 13.4:
 
 ## Security release of Ruby
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 11cb4a1938..2bfb0931e2 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/license_scout
-  revision: 0e89df12ad6bc451924610dd6a570fc264fde15e
+  revision: 013b1f8b9663f76fd0d1cd0bb95c8fb5b5198f3f
   specs:
     license_scout (0.1.3)
       ffi-yajl (~> 2.2)
@@ -26,7 +26,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: aa4162c2f7a4e8e5cf9d961e060d5a48a15a5e63
+  revision: 23de2052e79b7a03d2b0a080d2f6e111ce4c760d
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -39,13 +39,13 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     artifactory (2.8.2)
     awesome_print (1.8.0)
-    aws-sdk (2.10.45)
-      aws-sdk-resources (= 2.10.45)
-    aws-sdk-core (2.10.45)
+    aws-sdk (2.10.54)
+      aws-sdk-resources (= 2.10.54)
+    aws-sdk-core (2.10.54)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.45)
-      aws-sdk-core (= 2.10.45)
+    aws-sdk-resources (2.10.54)
+      aws-sdk-core (= 2.10.54)
     aws-sigv4 (1.0.2)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
@@ -86,7 +86,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (13.4.19)
+    chef-config (13.4.24)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -124,7 +124,7 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    method_source (0.8.2)
+    method_source (0.9.0)
     minitar (0.6.1)
     mixlib-archive (0.4.1)
       mixlib-log
@@ -173,11 +173,10 @@ GEM
       progressbar
       zhexdump (>= 0.0.2)
     plist (3.3.0)
-    progressbar (1.8.2)
-    pry (0.10.4)
+    progressbar (1.9.0)
+    pry (0.11.1)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+      method_source (~> 0.9.0)
     pry-byebug (3.5.0)
       byebug (~> 9.1)
       pry (~> 0.10)
@@ -204,7 +203,7 @@ GEM
       retryable (~> 2.0)
       semverse (~> 1.1)
       varia_model (~> 0.4.0)
-    ruby-progressbar (1.8.3)
+    ruby-progressbar (1.9.0)
     rubyntlm (0.6.2)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
@@ -212,7 +211,6 @@ GEM
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     semverse (1.2.1)
-    slop (3.6.0)
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
@@ -244,7 +242,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-fs (1.0.1)
+    winrm-fs (1.0.2)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)