From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 13 Oct 2013 17:49:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~571
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/09bde0baf96af07d5873e952f604fe4e2409e455

Merge remote-tracking branch 'upstream/master'

Conflicts:
	utils/update.php
---

09bde0baf96af07d5873e952f604fe4e2409e455
diff --cc utils/update.php
index 9a509fdf,42a7b59e..7448348f
--- a/utils/update.php
+++ b/utils/update.php
@@@ -460,16 -462,8 +462,17 @@@
  			$sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
  
  			// Index file
 -			$sThisIndexCmd = $sCMDIndex;
 +			if (!isset($aResult['index-instances']))
 +			{
 +				if (getLoadAverage() < 15)
 +					$iIndexInstances = 2;
 +				else
 +					$iIndexInstances = 1;
 +			} else
 +				$iIndexInstances = $aResult['index-instances'];
 +
 +			$sThisIndexCmd = $sCMDIndex.' -t '.$iIndexInstances;
+ 			$fCMDStartTime = time();
  
  			if (!$aResult['no-npi'])
  			{