From: Tom Hughes <tom@compton.nu>
Date: Thu, 25 Mar 2021 16:30:15 +0000 (+0000)
Subject: Merge remote-tracking branch 'github/pull/403'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/e72e795dcd2b2b4c7ab87aa7072a078d8d6de923?hp=-c

Merge remote-tracking branch 'github/pull/403'
---

e72e795dcd2b2b4c7ab87aa7072a078d8d6de923
diff --combined Gemfile.lock
index 51eb802fa,e7ad89df1..a52523317
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -4,9 -4,9 +4,9 @@@ GE
      ast (2.4.2)
      bcrypt_pbkdf (1.1.0)
      builder (3.2.4)
 -    chef-utils (16.10.17)
 +    chef-utils (16.11.7)
-     cookstyle (7.9.0)
-       rubocop (= 1.11.0)
+     cookstyle (7.10.0)
+       rubocop (= 1.12.0)
      diff-lcs (1.4.4)
      docker-api (2.0.0)
        excon (>= 0.47.0)
@@@ -14,7 -14,7 +14,7 @@@
      ed25519 (1.2.4)
      erubi (1.10.0)
      excon (0.79.0)
 -    ffi (1.14.2)
 +    ffi (1.15.0)
      gssapi (1.3.1)
        ffi (>= 1.0.1)
      gyoku (1.3.1)
@@@ -34,7 -34,7 +34,7 @@@
      logging (2.3.0)
        little-plugger (~> 1.1)
        multi_json (~> 1.14)
 -    mixlib-install (3.12.7)
 +    mixlib-install (3.12.11)
        mixlib-shellout
        mixlib-versioning
        thor
@@@ -73,7 -73,7 +73,7 @@@
        diff-lcs (>= 1.2.0, < 2.0)
        rspec-support (~> 3.9.0)
      rspec-support (3.9.3)
-     rubocop (1.11.0)
+     rubocop (1.12.0)
        parallel (~> 1.10)
        parser (>= 3.0.0.0)
        rainbow (>= 2.2.2, < 4.0)
@@@ -98,12 -98,12 +98,12 @@@
        net-ssh (>= 2.7)
        net-telnet (= 0.1.1)
        sfl
 -    strings (0.2.0)
 +    strings (0.2.1)
        strings-ansi (~> 0.2)
 -      unicode-display_width (~> 1.5)
 +      unicode-display_width (>= 1.5, < 3.0)
        unicode_utils (~> 1.4)
      strings-ansi (0.2.0)
 -    test-kitchen (2.11.1)
 +    test-kitchen (2.11.2)
        bcrypt_pbkdf (~> 1.0)
        chef-utils (>= 16.4.35)
        ed25519 (~> 1.2)
@@@ -133,7 -133,7 +133,7 @@@
        tty-screen (~> 0.8)
        wisper (~> 2.0)
      tty-screen (0.8.1)
 -    unicode-display_width (1.7.0)
 +    unicode-display_width (2.0.0)
      unicode_utils (1.4.0)
      winrm (2.3.6)
        builder (>= 2.1.2)