From: Tom Hughes <tom@compton.nu>
Date: Mon, 25 Oct 2021 11:17:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/458'
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/66f99783a567acd1eb1a0fee09d4cf799e40bc85?hp=-c

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

66f99783a567acd1eb1a0fee09d4cf799e40bc85
diff --combined Gemfile.lock
index 72c1c2aa6,2b52d7972..00984b322
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -7,8 -7,8 +7,8 @@@ GE
      chef-utils (17.6.18)
        concurrent-ruby
      concurrent-ruby (1.1.9)
 -    cookstyle (7.25.6)
 -      rubocop (= 1.22.0)
 +    cookstyle (7.25.8)
 +      rubocop (= 1.22.2)
      diff-lcs (1.4.4)
      docker-api (2.2.0)
        excon (>= 0.47.0)
@@@ -22,7 -22,7 +22,7 @@@
      gyoku (1.3.1)
        builder (>= 2.1.2)
      httpclient (2.8.3)
-     kitchen-dokken (2.15.0)
+     kitchen-dokken (2.16.0)
        docker-api (>= 1.33, < 3)
        lockfile (~> 2.1)
        test-kitchen (>= 1.15, < 4)
@@@ -75,7 -75,7 +75,7 @@@
        diff-lcs (>= 1.2.0, < 2.0)
        rspec-support (~> 3.10.0)
      rspec-support (3.10.2)
 -    rubocop (1.22.0)
 +    rubocop (1.22.2)
        parallel (~> 1.10)
        parser (>= 3.0.0.0)
        rainbow (>= 2.2.2, < 4.0)