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

diff --git a/Gemfile.lock b/Gemfile.lock
index 00984b322c5ded4ed3a674e8ad7cb3e9627bbdc7..90e0beb1d7ee59b72adc2343df04bae05560f72d 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,7 +4,7 @@ GEM
     ast (2.4.2)
     bcrypt_pbkdf (1.1.0)
     builder (3.2.4)
-    chef-utils (17.6.18)
+    chef-utils (17.7.22)
       concurrent-ruby
     concurrent-ruby (1.1.9)
     cookstyle (7.25.8)
@@ -105,7 +105,7 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    test-kitchen (3.1.0)
+    test-kitchen (3.1.1)
       bcrypt_pbkdf (~> 1.0)
       chef-utils (>= 16.4.35)
       ed25519 (~> 1.2)

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index e9c6040c910b999809e52ba6f0cf926d0a75fb15..8981e500ae71aa036bf960222c6582d777716807 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -26,7 +26,8 @@ default_attributes(
         :checkpoint_completion_target => "0.9",
         :jit => "off",
         :shared_buffers => "2GB",
-        :autovacuum_max_workers => "1"
+        :autovacuum_max_workers => "1",
+        :max_parallel_workers_per_gather => "0"
       }
     }
   },