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-10-26 17:06:13 +01:00
commit 50e63bf83d
4 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
HOWTO_RELEASE
View File

@ -1,12 +1,11 @@
1. Test (make clean all check), fix if broken before proceeding
2. Ensure proper version in package.json
3. Ensure NEWS section exists for the new version, review it, add release date
4. Drop npm-shrinkwrap.json
5. Run npm shrinkwrap to recreate npm-shrinkwrap.json
6. Commit package.json, npm-shrinwrap.json, NEWS
7. git tag -a Major.Minor.Patch # use NEWS section as content
8. Announce on cartodb@googlegroups.com
9. Stub NEWS/package for next version
4. Recreate npm-shrinkwrap.json with: `npm install --no-shrinkwrap && npm shrinkwrap`
5. Commit package.json, npm-shrinwrap.json, NEWS
6. git tag -a Major.Minor.Patch # use NEWS section as content
7. Announce on cartodb@googlegroups.com
8. Stub NEWS/package for next version
Versions:

17
NEWS.md
View File

@ -1,10 +1,25 @@
# Changelog
## 2.15.1
## 2.16.1
Released 2015-mm-dd
## 2.16.0
Released 2015-10-22
Announcements:
- Upgrades windshaft to [1.2.0](https://github.com/CartoDB/Windshaft/releases/tag/1.2.0)
## 2.15.1
Released 2015-10-21
Announcements:
- Upgrades windshaft to [1.1.1](https://github.com/CartoDB/Windshaft/releases/tag/1.1.1)
## 2.15.0

43
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{
"name": "windshaft-cartodb",
"version": "2.15.1",
"version": "2.16.1",
"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": {
@ -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"
}
}
@ -441,7 +441,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"
}
}
@ -522,9 +522,9 @@
"resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
"dependencies": {
"readable-stream": {
"version": "2.0.2",
"version": "2.0.3",
"from": "readable-stream@~2.0.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.3.tgz",
"dependencies": {
"core-util-is": {
"version": "1.0.1",
@ -581,9 +581,9 @@
"resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
"dependencies": {
"async": {
"version": "1.4.2",
"version": "1.5.0",
"from": "async@^1.4.0",
"resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz"
"resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
}
}
},
@ -662,9 +662,9 @@
"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
},
"boom": {
"version": "2.9.0",
"version": "2.10.0",
"from": "boom@^2.8.x",
"resolved": "https://registry.npmjs.org/boom/-/boom-2.9.0.tgz"
"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.0.tgz"
},
"cryptiles": {
"version": "2.0.5",
@ -684,9 +684,9 @@
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
},
"stringstream": {
"version": "0.0.4",
"version": "0.0.5",
"from": "stringstream@~0.0.4",
"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
},
"combined-stream": {
"version": "1.0.5",
@ -762,9 +762,9 @@
}
},
"commander": {
"version": "2.8.1",
"version": "2.9.0",
"from": "commander@^2.8.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
"dependencies": {
"graceful-readlink": {
"version": "1.0.1",
@ -827,7 +827,7 @@
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
},
"windshaft": {
"version": "1.1.1",
"version": "1.2.1",
"from": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension",
"resolved": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension",
"dependencies": {
@ -1217,8 +1217,8 @@
}
},
"grainstore": {
"version": "1.0.0",
"from": "grainstore@~1.0.0",
"version": "1.1.0",
"from": "grainstore@~1.1.0",
"dependencies": {
"carto": {
"version": "0.9.5-cdb2",
@ -2967,11 +2967,6 @@
}
}
}
},
"semver": {
"version": "1.1.4",
"from": "semver@~1.1.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz"
}
}
},

2
package.json
View File

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