Merge pull request #342 from CartoDB/upgrade-mapnik

Upgrade mapnik
This commit is contained in:
Raul Ochoa 2015-11-02 10:31:49 +01:00
commit 98b14de02e
3 changed files with 26 additions and 23 deletions

View File

@ -1,9 +1,12 @@
# Changelog
## 2.17.1
## 2.18.0
Released 2015-mm-dd
Announcements:
- Upgrades windshaft to [1.5.0](https://github.com/CartoDB/Windshaft/releases/tag/1.5.0)
## 2.17.0

40
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{
"name": "windshaft-cartodb",
"version": "2.17.1",
"version": "2.18.0",
"dependencies": {
"body-parser": {
"version": "1.14.1",
@ -533,7 +533,7 @@
},
"inherits": {
"version": "2.0.1",
"from": "inherits@2",
"from": "inherits@~2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"isarray": {
@ -594,7 +594,7 @@
},
"mime-types": {
"version": "2.1.7",
"from": "mime-types@2.1.7",
"from": "mime-types@~2.1.6",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
"dependencies": {
"mime-db": {
@ -827,13 +827,13 @@
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
},
"windshaft": {
"version": "1.4.0",
"from": "windshaft@~1.4.0",
"version": "1.5.0",
"from": "windshaft@~1.5.0",
"dependencies": {
"mapnik": {
"version": "1.4.15-cdb4",
"from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb4",
"resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb4",
"version": "1.4.15-cdb5",
"from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb5",
"resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb5",
"dependencies": {
"nan": {
"version": "1.2.0",
@ -2999,9 +2999,9 @@
}
},
"tilelive-mapnik": {
"version": "0.6.15-cdb2",
"from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb2",
"resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb2",
"version": "0.6.15-cdb3",
"from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb3",
"resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb3",
"dependencies": {
"generic-pool": {
"version": "2.1.1",
@ -3016,14 +3016,14 @@
}
},
"tilelive-bridge": {
"version": "1.3.0-cdb2",
"from": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb2",
"resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb2",
"version": "1.3.0-cdb3",
"from": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb3",
"resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb3",
"dependencies": {
"mapnik-pool": {
"version": "0.1.1-cdb2",
"from": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb2",
"resolved": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb2",
"version": "0.1.1-cdb3",
"from": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb3",
"resolved": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb3",
"dependencies": {
"generic-pool": {
"version": "2.1.1",
@ -3109,9 +3109,9 @@
"resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.11.0.tgz"
},
"abaculus": {
"version": "1.1.0-cdb2",
"from": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb2",
"resolved": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb2"
"version": "1.1.0-cdb3",
"from": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb3",
"resolved": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb3"
},
"sphericalmercator": {
"version": "1.0.3",

View File

@ -1,7 +1,7 @@
{
"private": true,
"name": "windshaft-cartodb",
"version": "2.17.1",
"version": "2.18.0",
"description": "A map tile server for CartoDB",
"keywords": [
"cartodb"
@ -29,7 +29,7 @@
"node-statsd": "~0.0.7",
"underscore" : "~1.6.0",
"dot": "~1.0.2",
"windshaft": "~1.4.0",
"windshaft": "~1.5.0",
"step": "~0.0.6",
"queue-async": "~1.0.7",
"request": "~2.62.0",