From f7f983fde52ce647b4c03faee91dd995aca12552 Mon Sep 17 00:00:00 2001 From: Pablo Alonso Garcia Date: Mon, 12 Jun 2017 11:50:07 +0200 Subject: [PATCH] Version 3.15.12 --- NEWS.md | 4 ++++ RELEASING.md | 12 ++++++------ bower.json | 2 +- package.json | 2 +- src/cartodb.js | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/NEWS.md b/NEWS.md index 87b76abf88..d5b3724db3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +3.15.12 (12/06/2017) +------- +* New Mapzen API key. + 3.15.11 (21/02/2017) ------- * Update torque.js dependency. diff --git a/RELEASING.md b/RELEASING.md index ff21be7461..23cb7954f6 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -13,7 +13,7 @@ - Create a new branch to prepare the release: ``` -git flow release start 3.15.11 +git flow release start 3.15.12 ``` - Build CartoDB.js files, choosing the new version: @@ -25,7 +25,7 @@ grunt release - Update the NEWS file and commit the changes. Take into account that new CartoDB.js version will be replaced in ```API.md```, ```RELEASING.md```, ```README.md```, ```package.json```, ```cartodb.js``` and ```examples``` files. ``` -git commit -am "Files changed for version 3.15.11" +git commit -am "Files changed for version 3.15.12" ``` - Release it. @@ -36,8 +36,8 @@ grunt publish - Check if those files have been updated in the CDN: ``` -http://libs.cartocdn.com.s3.amazonaws.com/cartodb.js/v3/3.15.11/cartodb.js -http://libs.cartocdn.com/cartodb.js/v3/3.15.11/cartodb.js +http://libs.cartocdn.com.s3.amazonaws.com/cartodb.js/v3/3.15.12/cartodb.js +http://libs.cartocdn.com/cartodb.js/v3/3.15.12/cartodb.js http://libs.cartocdn.com.s3.amazonaws.com/cartodb.js/v3/3.15/cartodb.js http://libs.cartocdn.com/cartodb.js/v3/3.15/cartodb.js ``` @@ -46,7 +46,7 @@ http://libs.cartocdn.com/cartodb.js/v3/3.15/cartodb.js - And to finish: close the release and push it. ``` -git flow release finish 3.15.11 +git flow release finish 3.15.12 git push --all git push --tags ``` @@ -75,7 +75,7 @@ grunt grunt publish ``` -For example, if we are in 3.15.11 and we want to go back to 3.13.4 +For example, if we are in 3.15.12 and we want to go back to 3.13.4 ``` git checkout 3.13.4 diff --git a/bower.json b/bower.json index 0f2bd5163f..c9c8859c40 100644 --- a/bower.json +++ b/bower.json @@ -4,7 +4,7 @@ "cartodb.js", "themes/css/cartodb.css" ], - "version": "3.15.11", + "version": "3.15.12", "homepage": "https://github.com/CartoDB/cartodb.js", "authors": [ "CartoDB " diff --git a/package.json b/package.json index 3d7cdddaf3..35d1ad8fed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb.js", - "version": "3.15.11", + "version": "3.15.12", "description": "CartoDB javascript library", "repository": { "type": "git", diff --git a/src/cartodb.js b/src/cartodb.js index 001a707f0d..aa86237e49 100644 --- a/src/cartodb.js +++ b/src/cartodb.js @@ -5,7 +5,7 @@ var cdb = root.cdb = {}; - cdb.VERSION = "3.15.11"; + cdb.VERSION = "3.15.12"; cdb.DEBUG = false; cdb.CARTOCSS_VERSIONS = {