Compare commits

..

5 Commits

Author SHA1 Message Date
Raul Ochoa
860d4bb475 Release 2.16.0 2015-10-22 16:27:52 +02:00
Raul Ochoa
c7b5fb9187 Be more clear about how to upgrade shrinkwrap file 2015-10-22 16:26:37 +02:00
Raul Ochoa
f513db837d Merge pull request #338 from CartoDB/upgrade-windshaft
Upgrades windshaft to 1.2.0
2015-10-21 18:56:45 +02:00
Raul Ochoa
d7181ec6c2 Upgrades windshaft to 1.2.0 2015-10-21 18:38:19 +02:00
Raul Ochoa
7761f56d36 Stubs next version 2015-10-21 13:58:26 +02:00
4 changed files with 26 additions and 14 deletions

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:

View File

@@ -1,5 +1,13 @@
# Changelog
## 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

17
npm-shrinkwrap.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "windshaft-cartodb",
"version": "2.15.1",
"version": "2.16.0",
"dependencies": {
"body-parser": {
"version": "1.14.1",
@@ -533,7 +533,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"
},
"isarray": {
@@ -827,8 +827,8 @@
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
},
"windshaft": {
"version": "1.1.1",
"from": "windshaft@~1.1.1",
"version": "1.2.0",
"from": "windshaft@~1.2.0",
"dependencies": {
"mapnik": {
"version": "1.4.15-cdb2",
@@ -1216,8 +1216,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",
@@ -2966,6 +2966,11 @@
}
}
}
},
"semver": {
"version": "5.0.3",
"from": "semver@~5.0.3",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
}
}
},

View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "windshaft-cartodb",
"version": "2.15.1",
"version": "2.16.0",
"description": "A map tile server for CartoDB",
"keywords": [
"cartodb"
@@ -29,7 +29,7 @@
"node-statsd": "~0.0.7",
"underscore" : "~1.6.0",
"dot": "~1.0.2",
"windshaft": "~1.1.1",
"windshaft": "~1.2.0",
"step": "~0.0.6",
"queue-async": "~1.0.7",
"request": "~2.62.0",