cartodb4/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
	package.json
This commit is contained in:
Raul Ochoa 2016-02-17 11:29:11 +01:00
commit 4db2c715a0
4 changed files with 55 additions and 34 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
## 2.23.1
## 2.24.1
Released 2016-mm-dd
## 2.24.0
Released 2016-02-15
Announcements:
- Upgrades windshaft to [1.10.0](https://github.com/CartoDB/Windshaft/releases/tag/1.10.1)
## 2.23.0
Released 2016-02-10

13
README.md
View File

@ -67,3 +67,16 @@ Contributing
---
See [CONTRIBUTING.md](CONTRIBUTING.md).
### Developing with a custom windshaft version
If you plan or want to use a custom / not released yet version of windshaft (or any other dependency) the best option is
to use `npm link`. You can read more about it at [npm-link: Symlink a package folder](https://docs.npmjs.com/cli/link).
**Quick start**:
```shell
~/windshaft-directory $ npm install
~/windshaft-directory $ npm link
~/windshaft-cartodb-directory $ npm link windshaft
```

62
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{
"name": "windshaft-cartodb",
"version": "2.23.1",
"version": "2.24.1",
"dependencies": {
"body-parser": {
"version": "1.14.2",
@ -84,14 +84,14 @@
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
},
"mime-types": {
"version": "2.1.9",
"version": "2.1.10",
"from": "mime-types@>=2.1.9 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
"dependencies": {
"mime-db": {
"version": "1.21.0",
"from": "mime-db@>=1.21.0 <1.22.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz"
"version": "1.22.0",
"from": "mime-db@>=1.22.0 <1.23.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
}
}
}
@ -456,14 +456,14 @@
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
},
"mime-types": {
"version": "2.1.9",
"version": "2.1.10",
"from": "mime-types@>=2.1.7 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
"dependencies": {
"mime-db": {
"version": "1.21.0",
"from": "mime-db@>=1.21.0 <1.22.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz"
"version": "1.22.0",
"from": "mime-db@>=1.22.0 <1.23.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
}
}
},
@ -594,14 +594,14 @@
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz",
"dependencies": {
"mime-types": {
"version": "2.1.9",
"version": "2.1.10",
"from": "mime-types@>=2.1.6 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
"dependencies": {
"mime-db": {
"version": "1.21.0",
"from": "mime-db@>=1.21.0 <1.22.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz"
"version": "1.22.0",
"from": "mime-db@>=1.22.0 <1.23.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
}
}
},
@ -659,7 +659,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"
}
}
@ -774,7 +774,7 @@
},
"type-is": {
"version": "1.6.11",
"from": "type-is@>=1.6.6 <1.7.0",
"from": "type-is@>=1.6.10 <1.7.0",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.11.tgz",
"dependencies": {
"media-typer": {
@ -783,14 +783,14 @@
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
},
"mime-types": {
"version": "2.1.9",
"version": "2.1.10",
"from": "mime-types@>=2.1.6 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
"dependencies": {
"mime-db": {
"version": "1.21.0",
"from": "mime-db@>=1.21.0 <1.22.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz"
"version": "1.22.0",
"from": "mime-db@>=1.22.0 <1.23.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
}
}
}
@ -998,14 +998,14 @@
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
},
"mime-types": {
"version": "2.1.9",
"version": "2.1.10",
"from": "mime-types@>=2.1.2 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
"dependencies": {
"mime-db": {
"version": "1.21.0",
"from": "mime-db@>=1.21.0 <1.22.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz"
"version": "1.22.0",
"from": "mime-db@>=1.22.0 <1.23.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
}
}
},
@ -1232,9 +1232,9 @@
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
},
"windshaft": {
"version": "1.9.0",
"from": "windshaft@1.9.0",
"resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.9.0.tgz",
"version": "1.10.1",
"from": "windshaft@1.10.1",
"resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.10.1.tgz",
"dependencies": {
"mapnik": {
"version": "1.4.15-cdb6",

4
package.json
View File

@ -1,7 +1,7 @@
{
"private": true,
"name": "windshaft-cartodb",
"version": "2.23.1",
"version": "2.24.1",
"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.9.0",
"windshaft": "1.10.1",
"camshaft": "https://github.com/CartoDB/camshaft/tarball/master",
"step": "~0.0.6",
"queue-async": "~1.0.7",