cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into mapconfig-extension

Browse Source 
Conflicts:
	npm-shrinkwrap.json
	package.json
This commit is contained in:
Raul Ochoa 2015-11-02 11:13:34 +01:00
commit 663703abae
3 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NEWS.md
View File

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

50
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "windshaft-cartodb", "name": "windshaft-cartodb",
"version": "2.17.1", "version": "2.18.1",
"dependencies": { "dependencies": {
"body-parser": { "body-parser": {
"version": "1.14.1", "version": "1.14.1",
@ -321,9 +321,9 @@
"resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz" "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"
}, },
"range-parser": { "range-parser": {
"version": "1.0.2", "version": "1.0.3",
"from": "range-parser@~1.0.2", "from": "range-parser@~1.0.2",
"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz" "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"
}, },
"send": { "send": {
"version": "0.13.0", "version": "0.13.0",
@ -441,7 +441,7 @@
}, },
"inherits": { "inherits": {
"version": "2.0.1", "version": "2.0.1",
"from": "inherits@~2.0.1", "from": "inherits@2",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
} }
} }
@ -522,9 +522,9 @@
"resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz", "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
"dependencies": { "dependencies": {
"readable-stream": { "readable-stream": {
"version": "2.0.3", "version": "2.0.4",
"from": "readable-stream@~2.0.0", "from": "readable-stream@~2.0.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.3.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
"dependencies": { "dependencies": {
"core-util-is": { "core-util-is": {
"version": "1.0.1", "version": "1.0.1",
@ -533,7 +533,7 @@
}, },
"inherits": { "inherits": {
"version": "2.0.1", "version": "2.0.1",
"from": "inherits@~2.0.1", "from": "inherits@2",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}, },
"isarray": { "isarray": {
@ -662,9 +662,9 @@
"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
}, },
"boom": { "boom": {
"version": "2.10.0", "version": "2.10.1",
"from": "boom@^2.8.x", "from": "boom@^2.8.x",
"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.0.tgz" "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
}, },
"cryptiles": { "cryptiles": {
"version": "2.0.5", "version": "2.0.5",
@ -827,14 +827,14 @@
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
}, },
"windshaft": { "windshaft": {
"version": "1.4.1", "version": "1.5.1",
"from": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension", "from": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension",
"resolved": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension", "resolved": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension",
"dependencies": { "dependencies": {
"mapnik": { "mapnik": {
"version": "1.4.15-cdb4", "version": "1.4.15-cdb5",
"from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb4", "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb5",
"resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb4", "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb5",
"dependencies": { "dependencies": {
"nan": { "nan": {
"version": "1.2.0", "version": "1.2.0",
@ -2995,9 +2995,9 @@
} }
}, },
"tilelive-mapnik": { "tilelive-mapnik": {
"version": "0.6.15-cdb2", "version": "0.6.15-cdb3",
"from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb2", "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb3",
"resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb2", "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb3",
"dependencies": { "dependencies": {
"generic-pool": { "generic-pool": {
"version": "2.1.1", "version": "2.1.1",
@ -3012,14 +3012,14 @@
} }
}, },
"tilelive-bridge": { "tilelive-bridge": {
"version": "1.3.0-cdb2", "version": "1.3.0-cdb3",
"from": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb2", "from": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb3",
"resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb2", "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb3",
"dependencies": { "dependencies": {
"mapnik-pool": { "mapnik-pool": {
"version": "0.1.1-cdb2", "version": "0.1.1-cdb3",
"from": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb2", "from": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb3",
"resolved": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb2", "resolved": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb3",
"dependencies": { "dependencies": {
"generic-pool": { "generic-pool": {
"version": "2.1.1", "version": "2.1.1",
@ -3110,9 +3110,9 @@
"resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.11.0.tgz" "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.11.0.tgz"
}, },
"abaculus": { "abaculus": {
"version": "1.1.0-cdb2", "version": "1.1.0-cdb3",
"from": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb2", "from": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb3",
"resolved": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb2" "resolved": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb3"
}, },
"sphericalmercator": { "sphericalmercator": {
"version": "1.0.3", "version": "1.0.3",

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"private": true, "private": true,
"name": "windshaft-cartodb", "name": "windshaft-cartodb",
"version": "2.17.1", "version": "2.18.1",
"description": "A map tile server for CartoDB", "description": "A map tile server for CartoDB",
"keywords": [ "keywords": [
"cartodb" "cartodb"