Merge branch 'master' into node-v6

NEWS.md

@@ -1,12 +1,18 @@
 #Changelog
 
-## 1.42.6
-Released 2016-12-12
+## 1.42.7
+Released 2016-mm-dd
 
 Announcements:
  * Upgrade cartodb-psql to ?.
- * Upgrade redis-mpool to 0.4.1.
+
+
+## 1.42.6
+Released 2016-12-19
+
+Announcements:
  * Upgrade cartodb-redis to 0.13.2.
+ * Upgrade redis-mpool to 0.4.1.
 
 
 ## 1.42.5

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb_sql_api",
-  "version": "1.42.6",
+  "version": "1.42.7",
   "dependencies": {
     "accepts": {
       "version": "1.2.13",
@@ -159,7 +159,7 @@
     },
     "cartodb-redis": {
       "version": "0.13.2",
-      "from": "cartodb-redis@>=0.13.2 <0.14.0",
+      "from": "cartodb-redis@0.13.2",
       "resolved": "https://registry.npmjs.org/cartodb-redis/-/cartodb-redis-0.13.2.tgz"
     },
     "caseless": {
@@ -422,7 +422,8 @@
     "glob": {
       "version": "6.0.4",
       "from": "glob@>=6.0.1 <7.0.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
+      "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+      "optional": true
     },
     "graceful-fs": {
       "version": "4.1.11",
@@ -907,7 +908,7 @@
     },
     "redis-mpool": {
       "version": "0.4.1",
-      "from": "redis-mpool@>=0.4.1 <0.5.0",
+      "from": "redis-mpool@0.4.1",
       "resolved": "https://registry.npmjs.org/redis-mpool/-/redis-mpool-0.4.1.tgz",
       "dependencies": {
         "generic-pool": {
@@ -940,7 +941,8 @@
     "rimraf": {
       "version": "2.4.5",
       "from": "rimraf@>=2.4.0 <2.5.0",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
+      "optional": true
     },
     "safe-json-stringify": {
       "version": "1.0.3",

package.json

@@ -5,7 +5,7 @@
   "keywords": [
     "cartodb"
   ],
-  "version": "1.42.6",
+  "version": "1.42.7",
   "repository": {
     "type": "git",
     "url": "git://github.com/CartoDB/CartoDB-SQL-API.git"
@@ -21,7 +21,7 @@
     "bunyan": "1.8.1",
     "cartodb-psql": "cartodb/node-cartodb-psql#node-v6",
     "cartodb-query-tables": "0.2.0",
-    "cartodb-redis": "~0.13.2",
+    "cartodb-redis": "0.13.2",
     "debug": "2.2.0",
     "express": "~4.13.3",
     "log4js": "cartodb/log4js-node#cdb",
@@ -32,7 +32,7 @@
     "oauth-client": "0.3.0",
     "qs": "~6.2.1",
     "queue-async": "~1.0.7",
-    "redis-mpool": "~0.4.1",
+    "redis-mpool": "0.4.1",
     "redlock": "2.0.1",
     "request": "~2.75.0",
     "step": "~0.0.5",