From: Tom Hughes <tom@compton.nu>
Date: Tue, 2 Mar 2021 08:13:36 +0000 (+0000)
Subject: Merge remote-tracking branch 'github/pull/397'
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/55aef96b13f79515121ce537ce7a9515d7d937f5?ds=sidebyside;hp=-c

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

55aef96b13f79515121ce537ce7a9515d7d937f5
diff --combined Gemfile.lock
index 0f43e654f,927637a28..900b7d8ec
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -20,7 -20,7 +20,7 @@@ GE
      gyoku (1.3.1)
        builder (>= 2.1.2)
      httpclient (2.8.3)
-     kitchen-dokken (2.12.0)
+     kitchen-dokken (2.12.1)
        docker-api (>= 1.33, < 3)
        lockfile (~> 2.1)
        test-kitchen (>= 1.15, < 3)
@@@ -103,9 -103,8 +103,9 @@@
        unicode-display_width (~> 1.5)
        unicode_utils (~> 1.4)
      strings-ansi (0.2.0)
 -    test-kitchen (2.10.0)
 +    test-kitchen (2.11.0)
        bcrypt_pbkdf (~> 1.0)
 +      chef-utils (>= 16.4.35)
        ed25519 (~> 1.2)
        license-acceptance (>= 1.0.11, < 3.0)
        mixlib-install (~> 3.6)