Merge branch 'master' into refactor

2019-02-05 08:49:59 +01:00
parent d40be45e9a ec952d88cc
commit b3a995f880
1 changed files with 21 additions and 0 deletions
@@ -4175,6 +4175,27 @@
        "tilelive-mapnik": "github:cartodb/tilelive-mapnik#6f08373b3fa9bef3b65bfeb789f7e70ee7c42fb1",
        "torque.js": "2.17.1",
        "underscore": "1.6.0"
+      },
+      "dependencies": {
+        "generic-pool": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.5.0.tgz",
+          "integrity": "sha512-dEkxmX+egB2o4NR80c/q+xzLLzLX+k68/K8xv81XprD+Sk7ZtP14VugeCz+fUwv5FzpWq40pPtAkzPRqT8ka9w=="
+        },
+        "mime": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
+          "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg=="
+        },
+        "tilelive-mapnik": {
+          "version": "github:cartodb/tilelive-mapnik#a16ae79202d1b4288c1b0fe28c5e939e3be6b594",
+          "from": "github:cartodb/tilelive-mapnik#0.6.18-cdb17",
+          "requires": {
+            "@carto/mapnik": "3.6.2-carto.11",
+            "generic-pool": "3.5.0",
+            "mime": "2.3.1"
+          }
+        }
      }
    },
    "wordwrap": {