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

Merge branch 'master' into analysis-layers

Browse Source 
Conflicts:
	npm-shrinkwrap.json
This commit is contained in:
Raul Ochoa 2016-03-23 16:09:28 +01:00
commit 4d39d30f6e
3 changed files with 82 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
NEWS.md
View File

@ -1,10 +1,26 @@
# Changelog
## 2.30.1
## 2.31.2
Released 2016-mm-dd
## 2.31.1
Released 2016-03-23
Announcements:
- Upgrades windshaft to [1.16.1](https://github.com/CartoDB/Windshaft/releases/tag/1.16.1)
## 2.31.0
Released 2016-03-16
Announcements:
- Upgrades windshaft to [1.16.0](https://github.com/CartoDB/Windshaft/releases/tag/1.16.0)
## 2.30.0
Released 2016-03-15

80
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{
"name": "windshaft-cartodb",
"version": "2.30.1",
"version": "2.31.2",
"dependencies": {
"body-parser": {
"version": "1.14.2",
@ -80,7 +80,7 @@
},
"type-is": {
"version": "1.6.12",
"from": "type-is@>=1.6.10 <1.7.0",
"from": "type-is@>=1.6.6 <1.7.0",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.12.tgz",
"dependencies": {
"media-typer": {
@ -90,7 +90,7 @@
},
"mime-types": {
"version": "2.1.10",
"from": "mime-types@>=2.1.10 <2.2.0",
"from": "mime-types@>=2.1.2 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
"dependencies": {
"mime-db": {
@ -111,7 +111,7 @@
"dependencies": {
"async": {
"version": "1.5.2",
"from": "async@>=1.5.2 <2.0.0",
"from": "async@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
},
"request": {
@ -671,7 +671,7 @@
"dependencies": {
"unpipe": {
"version": "1.0.0",
"from": "unpipe@>=1.0.0 <1.1.0",
"from": "unpipe@1.0.0",
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
}
}
@ -757,7 +757,7 @@
"dependencies": {
"inherits": {
"version": "2.0.1",
"from": "inherits@>=2.0.1 <2.1.0",
"from": "inherits@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
@ -857,7 +857,7 @@
},
"inherits": {
"version": "2.0.1",
"from": "inherits@>=2.0.1 <2.1.0",
"from": "inherits@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
@ -950,7 +950,7 @@
},
"inherits": {
"version": "2.0.1",
"from": "inherits@>=2.0.1 <2.1.0",
"from": "inherits@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"isarray": {
@ -999,7 +999,7 @@
"dependencies": {
"async": {
"version": "1.5.2",
"from": "async@>=1.5.2 <2.0.0",
"from": "async@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
}
}
@ -1011,7 +1011,7 @@
},
"mime-types": {
"version": "2.1.10",
"from": "mime-types@>=2.1.10 <2.2.0",
"from": "mime-types@>=2.1.2 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
"dependencies": {
"mime-db": {
@ -1294,7 +1294,7 @@
},
"mime": {
"version": "1.3.4",
"from": "mime@>=1.2.11 <2.0.0",
"from": "mime@1.3.4",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
},
"mkdirp": {
@ -1335,7 +1335,7 @@
"dependencies": {
"supports-color": {
"version": "3.1.2",
"from": "supports-color@>=3.1.2 <4.0.0",
"from": "supports-color@>=3.1.0 <4.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
"dependencies": {
"has-flag": {
@ -1347,7 +1347,7 @@
},
"source-map": {
"version": "0.5.3",
"from": "source-map@>=0.5.1 <0.6.0",
"from": "source-map@>=0.5.3 <0.6.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
},
"js-base64": {
@ -1418,7 +1418,7 @@
},
"inherits": {
"version": "2.0.1",
"from": "inherits@>=2.0.1 <2.1.0",
"from": "inherits@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"isarray": {
@ -1774,9 +1774,9 @@
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
},
"windshaft": {
"version": "1.15.0",
"from": "windshaft@1.15.0",
"resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.15.0.tgz",
"version": "1.16.1",
"from": "windshaft@1.16.1",
"resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.16.1.tgz",
"dependencies": {
"abaculus": {
"version": "1.1.0-cdb4",
@ -1824,6 +1824,11 @@
}
}
},
"es6-promise": {
"version": "3.1.2",
"from": "es6-promise@>=3.1.2 <4.0.0",
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.1.2.tgz"
},
"grainstore": {
"version": "1.1.1",
"from": "grainstore@1.1.1",
@ -4654,6 +4659,47 @@
}
}
},
"postcss": {
"version": "5.0.19",
"from": "postcss@>=5.0.18 <6.0.0",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.0.19.tgz",
"dependencies": {
"supports-color": {
"version": "3.1.2",
"from": "supports-color@>=3.1.2 <4.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
"dependencies": {
"has-flag": {
"version": "1.0.0",
"from": "has-flag@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
}
}
},
"source-map": {
"version": "0.5.3",
"from": "source-map@>=0.5.1 <0.6.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
},
"js-base64": {
"version": "2.1.9",
"from": "js-base64@>=2.1.9 <3.0.0",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz"
}
}
},
"postcss-each": {
"version": "0.9.1",
"from": "postcss-each@>=0.9.1 <0.10.0",
"resolved": "https://registry.npmjs.org/postcss-each/-/postcss-each-0.9.1.tgz",
"dependencies": {
"postcss-simple-vars": {
"version": "1.2.0",
"from": "postcss-simple-vars@>=1.2.0 <2.0.0",
"resolved": "https://registry.npmjs.org/postcss-simple-vars/-/postcss-simple-vars-1.2.0.tgz"
}
}
},
"semver": {
"version": "5.0.3",
"from": "semver@>=5.0.3 <5.1.0",

4
package.json
View File

@ -1,7 +1,7 @@
{
"private": true,
"name": "windshaft-cartodb",
"version": "2.30.1",
"version": "2.31.2",
"description": "A map tile server for CartoDB",
"keywords": [
"cartodb"
@ -26,7 +26,7 @@
"node-statsd": "~0.0.7",
"underscore" : "~1.6.0",
"dot": "~1.0.2",
"windshaft": "1.15.0",
"windshaft": "1.16.1",
"step": "~0.0.6",
"queue-async": "~1.0.7",
"request": "~2.62.0",