Merge branch 'master' into analysis-layers

NEWS.md

@@ -1,16 +1,24 @@
 # Changelog
 
-## 2.24.1
+## 2.25.1
 
 Released 2016-mm-dd
 
 
+## 2.25.0
+
+Released 2016-02-18
+
+Announcements:
+ - Upgrades windshaft to [1.11.0](https://github.com/CartoDB/Windshaft/releases/tag/1.11.0)
+
+
 ## 2.24.0
 
 Released 2016-02-15
 
 Announcements:
- - Upgrades windshaft to [1.10.0](https://github.com/CartoDB/Windshaft/releases/tag/1.10.1)
+ - Upgrades windshaft to [1.10.1](https://github.com/CartoDB/Windshaft/releases/tag/1.10.1)
 
 
 ## 2.23.0

docs/named_maps.md

@@ -461,6 +461,9 @@ cartodb.createLayer('map_dom_id',layerSource)
 [CartoDB.js](http://docs.cartodb.com/cartodb-platform/cartodb-js/) has methods for accessing your named maps.
 
 1. [layer.setParams()](http://docs.cartodb.com/cartodb-platform/cartodb-js/api-methods/#layersetparamskey-value) allows you to change the template variables (in the placeholders object) via JavaScript
+
+    **Note:** The CartoDB.js `layer.setParams()` function is not supported when using Named maps for Torque.
+
 2. [layer.setAuthToken()](http://docs.cartodb.com/cartodb-platform/cartodb-js/api-methods/#layersetauthtokenauthtoken) allows you to set the auth tokens to create the layer
 
 ### Complete Examples of Named Maps created with CartoDB.js

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.24.1",
+  "version": "2.25.1",
   "dependencies": {
     "body-parser": {
       "version": "1.14.2",
@@ -1179,9 +1179,9 @@
               }
             },
             "is-my-json-valid": {
-              "version": "2.12.4",
+              "version": "2.13.0",
               "from": "is-my-json-valid@>=2.12.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.4.tgz",
+              "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.0.tgz",
               "dependencies": {
                 "generate-function": {
                   "version": "2.0.0",
@@ -1232,9 +1232,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "1.10.1",
-      "from": "windshaft@1.10.1",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.10.1.tgz",
+      "version": "1.11.0",
+      "from": "windshaft@1.11.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.11.0.tgz",
       "dependencies": {
         "mapnik": {
           "version": "1.4.15-cdb6",

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.24.1",
+    "version": "2.25.1",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -26,7 +26,7 @@
         "node-statsd": "~0.0.7",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "1.10.1",
+        "windshaft": "1.11.0",
         "step": "~0.0.6",
         "queue-async": "~1.0.7",
         "request": "~2.62.0",