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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 44513eab3d1a0edda9c5c5f28aa98ef04c3ee55a..0fd7fb6727b200949cc15a5228518c822369005e 100644 (file)
--- 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 dcb011087ad3b0a4d92c79c75ce610453572ec94..8fc39ddba77ae719bf8cad8a1ff03ca3f37325ae 100644 (file)
--- 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 => {