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

Merge branch 'master' into analysis-layers

Browse Source
This commit is contained in:
Raul Ochoa
2016-02-24 17:28:03 +01:00
parent d923b343fc 06164af17f
commit e958f925d3
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS.md
+9 -1
View File
@@ -1,8 +1,16 @@
# Changelog
## 2.26.2
Released 2016-mm-dd
## 2.26.1
Released 2016-mm-dd
Released 2016-02-24
Announcements:
- Upgrades windshaft to [1.13.1](https://github.com/CartoDB/Windshaft/releases/tag/1.13.1)
## 2.26.0
npm-shrinkwrap.json
Generated
+8 -8
View File
@@ -1,6 +1,6 @@
{
"name": "windshaft-cartodb",
"version": "2.26.1",
"version": "2.26.2",
"dependencies": {
"body-parser": {
"version": "1.14.2",
@@ -85,7 +85,7 @@
},
"mime-types": {
"version": "2.1.10",
"from": "mime-types@>=2.1.2 <2.2.0",
"from": "mime-types@>=2.1.9 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
"dependencies": {
"mime-db": {
@@ -595,7 +595,7 @@
"dependencies": {
"mime-types": {
"version": "2.1.10",
"from": "mime-types@>=2.1.9 <2.2.0",
"from": "mime-types@>=2.1.6 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
"dependencies": {
"mime-db": {
@@ -784,7 +784,7 @@
},
"mime-types": {
"version": "2.1.10",
"from": "mime-types@>=2.1.9 <2.2.0",
"from": "mime-types@>=2.1.6 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
"dependencies": {
"mime-db": {
@@ -999,7 +999,7 @@
},
"mime-types": {
"version": "2.1.10",
"from": "mime-types@>=2.1.2 <2.2.0",
"from": "mime-types@>=2.1.9 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
"dependencies": {
"mime-db": {
@@ -1239,9 +1239,9 @@
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
},
"windshaft": {
"version": "1.13.0",
"from": "windshaft@1.13.0",
"resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.13.0.tgz",
"version": "1.13.1",
"from": "windshaft@1.13.1",
"resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.13.1.tgz",
"dependencies": {
"abaculus": {
"version": "1.1.0-cdb4",
package.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"private": true,
"name": "windshaft-cartodb",
"version": "2.26.1",
"version": "2.26.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.13.0",
"windshaft": "1.13.1",
"step": "~0.0.6",
"queue-async": "~1.0.7",
"request": "~2.62.0",