Merge branch 'master' into private-cdb_tablemetadata

This commit is contained in:
Raul Ochoa 2015-02-16 14:18:56 +01:00
commit 21b3f44441
3 changed files with 8 additions and 3 deletions

View File

@ -1,4 +1,8 @@
1.27.0 -- 2015-mm-dd 1.27.1 -- 2015-mm-dd
--------------------
1.27.0 -- 2015-02-16
-------------------- --------------------
Announcements: Announcements:
@ -11,6 +15,7 @@ New features:
Bugfixes: Bugfixes:
- Fixes tests with beforeEach and afterEach triggers - Fixes tests with beforeEach and afterEach triggers
1.26.2 -- 2015-01-28 1.26.2 -- 2015-01-28
-------------------- --------------------

2
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "windshaft-cartodb", "name": "windshaft-cartodb",
"version": "1.26.3", "version": "1.27.1",
"dependencies": { "dependencies": {
"cartodb-psql": { "cartodb-psql": {
"version": "0.4.0", "version": "0.4.0",

View File

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