From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 16 Sep 2016 19:55:44 +0000 (+0200)
Subject: Merge pull request #532 from mtmail/PSR2-namespaces
X-Git-Tag: v3.0.0~122
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/bf77b444bf9f18be6bc98c05c8dfc6d796ab30fa?hp=6238ae6032c6f8005dad34d3369df2d280d1e5df

Merge pull request #532 from mtmail/PSR2-namespaces

add namespaces, method visibility according to PSR2 standard
---

diff --git a/vagrant/install-on-ubuntu-16.sh b/vagrant/install-on-ubuntu-16.sh
index a4b9ddee..b40dbce1 100755
--- a/vagrant/install-on-ubuntu-16.sh
+++ b/vagrant/install-on-ubuntu-16.sh
@@ -19,7 +19,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 #
 
     sudo apt-get update -qq
-    sudo apt-get -o Dpkg::Options::="--force-confnew" --force-yes -fuy dist-upgrade #DOCS:    sudo apt-get upgrade
+    sudo apt-get -o Dpkg::Options::="--force-confold" --force-yes -fuy dist-upgrade #DOCS:    sudo apt-get upgrade
 
 # Now you can install all packages needed for Nominatim: