From: Grant Slater <openstreetmap@firefishy.com>
Date: Tue, 30 Apr 2019 12:54:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/234'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/d15cdcae23cefa634aa6bef7c884d5550a8e1989?hp=019076da87fd379a3768f4bb2bb3563a40ba1fb9

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 44513eab3..0fd7fb672 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -13,7 +13,7 @@ Metrics/AbcSize:
 # Offense count: 27
 # Configuration parameters: CountComments.
 Metrics/BlockLength:
-  Max: 363
+  Max: 364
 
 Metrics/BlockNesting:
   Max: 4
diff --git a/roles/saphira.rb b/roles/saphira.rb
index dcb011087..8fc39ddba 100644
--- a/roles/saphira.rb
+++ b/roles/saphira.rb
@@ -23,7 +23,7 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "6100 MB",
+    :cache_mem => "5120 MB",
     :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {