Merge branch 'master' into eslint

2019-11-14 14:53:53 +01:00 · 2019-11-14 14:53:53 +01:00 · 8d69af4445
commit 8d69af4445
parent d446ba9c1b 3c301ce742
1 changed files with 2 additions and 1 deletions
--- a/test/acceptance/ported/support/ported-server-options.js
+++ b/test/acceptance/ported/support/ported-server-options.js
@ -17,7 +17,8 @@ module.exports = _.extend({}, serverOptions, {
        },
        cachedir: global.environment.millstone.cache_basedir,
        mapnik_version: global.environment.mapnik_version || mapnik.versions.mapnik,
-        gc_prob: 0 // run the garbage collector at each invocation
+        gc_prob: 0, // run the garbage collector at each invocation
+        default_layergroup_ttl: global.environment.mapConfigTTL || 7200
    },
    renderer: {
        mapnik: {