Merge branch 'master' into eslint

2019-11-13 19:00:50 +01:00
parent 734c373f3d ccd01e6da5
commit 2c8a030ecb
21 changed files with 333 additions and 133 deletions
@@ -242,7 +242,7 @@ module.exports = class NamedMapMapConfigProvider extends BaseMapConfigProvider {
            }

            dbParams.dbuser = databaseParams.dbuser;
-            dbParams.dbpass = databaseParams.dbpass;
+            dbParams.dbpassword = databaseParams.dbpassword;
            dbParams.dbhost = databaseParams.dbhost;
            dbParams.dbport = databaseParams.dbport;
            dbParams.dbname = databaseParams.dbname;