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-24 13:36:39 +01:00
commit ad566d8ff0
4 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
NEWS.md
View File

@ -1,11 +1,23 @@
# Changelog
## 2.19.2
Released 2015-mm-dd
## 2.19.1
Released 2015-11-23
Announcements:
- Upgrades windshaft to [1.6.1](https://github.com/CartoDB/Windshaft/releases/tag/1.6.1)
## 2.19.0
Released 2015-11-12
Announcements:
- Upgrades windshaft to [1.6.0](https://github.com/CartoDB/Windshaft/releases/tag/1.6.0)
## 2.18.0

10
README.md
View File

@ -31,6 +31,15 @@ Requirements
- For running the testsuite
- ImageMagick (http://www.imagemagick.org)
Dependencies installation example:
```shell
sudo add-apt-repository -y ppa:cartodb/cairo
sudo apt-get update
sudo apt-get install -y build-essential checkinstall pkg-config libcairo2-dev libjpeg8-dev libgif-dev
```
Configure
---------
@ -46,7 +55,6 @@ Build/install
To fetch and build all node-based dependencies, run:
```
git clone
npm install
```

20
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{
"name": "windshaft-cartodb",
"version": "2.19.1",
"version": "2.19.2",
"dependencies": {
"body-parser": {
"version": "1.14.1",
@ -58,7 +58,7 @@
},
"qs": {
"version": "5.1.0",
"from": "qs@~5.1.0",
"from": "qs@5.1.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
},
"raw-body": {
@ -68,14 +68,14 @@
"dependencies": {
"unpipe": {
"version": "1.0.0",
"from": "unpipe@~1.0.0",
"from": "unpipe@1.0.0",
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
}
}
},
"type-is": {
"version": "1.6.9",
"from": "type-is@~1.6.6",
"from": "type-is@~1.6.9",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.9.tgz",
"dependencies": {
"media-typer": {
@ -192,7 +192,7 @@
"dependencies": {
"mime-types": {
"version": "2.1.7",
"from": "mime-types@~2.1.7",
"from": "mime-types@~2.1.6",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
"dependencies": {
"mime-db": {
@ -359,7 +359,7 @@
},
"statuses": {
"version": "1.2.1",
"from": "statuses@1",
"from": "statuses@~1.2.1",
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"
}
}
@ -381,7 +381,7 @@
},
"mime-types": {
"version": "2.1.7",
"from": "mime-types@~2.1.7",
"from": "mime-types@~2.1.6",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
"dependencies": {
"mime-db": {
@ -441,7 +441,7 @@
},
"inherits": {
"version": "2.0.1",
"from": "inherits@~2.0.1",
"from": "inherits@2",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
@ -594,7 +594,7 @@
},
"mime-types": {
"version": "2.1.7",
"from": "mime-types@~2.1.7",
"from": "mime-types@~2.1.2",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
"dependencies": {
"mime-db": {
@ -827,7 +827,7 @@
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
},
"windshaft": {
"version": "1.6.1",
"version": "1.6.2",
"from": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension",
"resolved": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension",
"dependencies": {

2
package.json
View File

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