From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 29 Aug 2015 11:16:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~435
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/5b767a2cc8cbec9df0743d8bb959456fa24a2380

Merge remote-tracking branch 'upstream/master'

Conflicts:
	utils/setup.php
---

5b767a2cc8cbec9df0743d8bb959456fa24a2380
diff --cc utils/setup.php
index be422949,782665d7..0ecf5e6d
--- a/utils/setup.php
+++ b/utils/setup.php
@@@ -200,8 -200,8 +200,8 @@@
  			$osm2pgsql .= ' --tablespace-main-data '.CONST_Tablespace_Place_Data;
  		if (CONST_Tablespace_Place_Index)
  			$osm2pgsql .= ' --tablespace-main-index '.CONST_Tablespace_Place_Index;
- 		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
+ 		$osm2pgsql .= ' -lsc -O gazetteer --hstore --number-processes 1';
 -		$osm2pgsql .= ' -C '.$iCacheMemory;
 +		$osm2pgsql .= ' -C 25000';
  		$osm2pgsql .= ' -P '.$aDSNInfo['port'];
  		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
  		passthruCheckReturn($osm2pgsql);