From: Tom Hughes Date: Tue, 15 Sep 2020 07:04:17 +0000 (+0100) Subject: Merge remote-tracking branch 'github/pull/341' X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/d0f39d5c13dd3a6717dbe8331d3a6e63ef79ce28?hp=b43ae7c214d79cb22a621eb0c271da168ba03076 Merge remote-tracking branch 'github/pull/341' --- diff --git a/Gemfile.lock b/Gemfile.lock index e6656041a..46d14142b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GEM cookstyle (6.17.7) rubocop (= 0.90.0) diff-lcs (1.4.4) - docker-api (1.34.2) + docker-api (2.0.0) excon (>= 0.47.0) multi_json ed25519 (1.2.4) @@ -20,8 +20,8 @@ GEM gyoku (1.3.1) builder (>= 2.1.2) httpclient (2.8.3) - kitchen-dokken (2.10.0) - docker-api (~> 1.33) + kitchen-dokken (2.11.0) + docker-api (>= 1.33, < 3) lockfile (~> 2.1) test-kitchen (>= 1.15, < 3) license-acceptance (2.1.2)