cartodb4/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-10-28 19:41:44 +01:00
parent e5afdb1e04 a20a1f692b
commit 3b9759d5e4
3 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
NEWS.md
View File

@@ -1,10 +1,18 @@
# Changelog
## 2.16.1
## 2.17.1
Released 2015-mm-dd
## 2.17.0
Released 2015-10-28
Announcements:
- Upgrades windshaft to [1.4.0](https://github.com/CartoDB/Windshaft/releases/tag/1.4.0)
## 2.16.0
Released 2015-10-22

36
npm-shrinkwrap.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "windshaft-cartodb",
"version": "2.16.1",
"version": "2.17.1",
"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": {
@@ -827,14 +827,14 @@
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
},
"windshaft": {
"version": "1.2.1",
"version": "1.4.1",
"from": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension",
"resolved": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension",
"dependencies": {
"mapnik": {
"version": "1.4.15-cdb2",
"from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb2",
"resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb2",
"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",
"dependencies": {
"nan": {
"version": "1.2.0",
@@ -2995,9 +2995,9 @@
}
},
"tilelive-mapnik": {
"version": "0.6.15",
"from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.x-cdb1",
"resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.x-cdb1",
"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",
"dependencies": {
"generic-pool": {
"version": "2.1.1",
@@ -3012,14 +3012,14 @@
}
},
"tilelive-bridge": {
"version": "1.3.0",
"from": "https://github.com/CartoDB/tilelive-bridge/tarball/gzip-option",
"resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/gzip-option",
"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",
"dependencies": {
"mapnik-pool": {
"version": "0.1.1",
"from": "https://github.com/CartoDB/mapnik-pool/tarball/cdb",
"resolved": "https://github.com/CartoDB/mapnik-pool/tarball/cdb",
"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",
"dependencies": {
"generic-pool": {
"version": "2.1.1",
@@ -3110,9 +3110,9 @@
"resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.11.0.tgz"
},
"abaculus": {
"version": "1.1.0",
"from": "https://github.com/CartoDB/abaculus/tarball/cdb",
"resolved": "https://github.com/CartoDB/abaculus/tarball/cdb"
"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"
},
"sphericalmercator": {
"version": "1.0.3",

2
package.json
View File

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