From: Tom Hughes <tom@compton.nu>
Date: Fri, 14 Aug 2020 08:26:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/330'
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/52019b9423e870cc7463885e084c57df9c088fa2?ds=inline;hp=-c

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

52019b9423e870cc7463885e084c57df9c088fa2
diff --combined Gemfile.lock
index 855c18b6b,02de5525f..03b5cad9f
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -5,14 -5,13 +5,13 @@@ GE
      bcrypt_pbkdf (1.0.1)
      builder (3.2.4)
      chef-utils (16.3.45)
 -    cookstyle (6.15.3)
 +    cookstyle (6.15.5)
        rubocop (= 0.89.1)
      diff-lcs (1.4.4)
      docker-api (1.34.2)
        excon (>= 0.47.0)
        multi_json
      ed25519 (1.2.4)
-     equatable (0.6.1)
      erubi (1.9.0)
      excon (0.76.0)
      ffi (1.13.1)
@@@ -25,25 -24,24 +24,24 @@@
        docker-api (~> 1.33)
        lockfile (~> 2.1)
        test-kitchen (>= 1.15, < 3)
-     license-acceptance (1.0.19)
+     license-acceptance (2.0.0)
        pastel (~> 0.7)
        tomlrb (~> 1.2)
-       tty-box (~> 0.3)
-       tty-prompt (~> 0.18)
+       tty-box (~> 0.6)
+       tty-prompt (~> 0.20)
      little-plugger (1.1.4)
      lockfile (2.1.3)
      logging (2.3.0)
        little-plugger (~> 1.1)
        multi_json (~> 1.14)
-     mixlib-install (3.12.1)
+     mixlib-install (3.12.3)
        mixlib-shellout
        mixlib-versioning
        thor
-     mixlib-shellout (3.1.2)
+     mixlib-shellout (3.1.4)
        chef-utils
      mixlib-versioning (1.2.12)
      multi_json (1.15.0)
-     necromancer (0.5.1)
      net-scp (3.0.0)
        net-ssh (>= 2.6.5, < 7.0.0)
      net-ssh (6.1.0)
@@@ -54,8 -52,7 +52,7 @@@
      parallel (1.19.2)
      parser (2.7.1.4)
        ast (~> 2.4.1)
-     pastel (0.7.4)
-       equatable (~> 0.6)
+     pastel (0.8.0)
        tty-color (~> 0.5)
      rainbow (3.0.0)
      regexp_parser (1.7.1)
@@@ -101,15 -98,15 +98,15 @@@
        net-ssh (>= 2.7)
        net-telnet (= 0.1.1)
        sfl
-     strings (0.1.8)
-       strings-ansi (~> 0.1)
+     strings (0.2.0)
+       strings-ansi (~> 0.2)
        unicode-display_width (~> 1.5)
        unicode_utils (~> 1.4)
      strings-ansi (0.2.0)
-     test-kitchen (2.5.4)
+     test-kitchen (2.6.0)
        bcrypt_pbkdf (~> 1.0)
        ed25519 (~> 1.2)
-       license-acceptance (~> 1.0, >= 1.0.11)
+       license-acceptance (>= 1.0.11, < 3.0)
        mixlib-install (~> 3.6)
        mixlib-shellout (>= 1.2, < 4.0)
        net-scp (>= 1.1, < 4.0)
@@@ -121,20 -118,19 +118,19 @@@
        winrm-fs (~> 1.1)
      thor (1.0.1)
      tomlrb (1.3.0)
-     tty-box (0.5.0)
-       pastel (~> 0.7.2)
-       strings (~> 0.1.6)
+     tty-box (0.6.0)
+       pastel (~> 0.8)
+       strings (~> 0.2.0)
        tty-cursor (~> 0.7)
      tty-color (0.5.2)
      tty-cursor (0.7.1)
-     tty-prompt (0.21.0)
-       necromancer (~> 0.5.0)
-       pastel (~> 0.7.0)
-       tty-reader (~> 0.7.0)
-     tty-reader (0.7.0)
+     tty-prompt (0.22.0)
+       pastel (~> 0.8)
+       tty-reader (~> 0.8)
+     tty-reader (0.8.0)
        tty-cursor (~> 0.7)
-       tty-screen (~> 0.7)
-       wisper (~> 2.0.0)
+       tty-screen (~> 0.8)
+       wisper (~> 2.0)
      tty-screen (0.8.1)
      unicode-display_width (1.7.0)
      unicode_utils (1.4.0)