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

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

e72e795dcd2b2b4c7ab87aa7072a078d8d6de923
diff --cc 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)