Merge branch 'master' into 257-remove-old-api

Conflicts:
	package.json

NEWS.md

@@ -1,7 +1,14 @@
-1.28.5 -- 2015-mm-dd
+1.28.6 -- 2015-mm-dd
 --------------------
 
 
+1.28.5 -- 2015-02-20
+--------------------
+
+Announcements:
+- Upgrades windshaft to [0.37.5](https://github.com/CartoDB/Windshaft/releases/tag/0.37.5)
+
+
 1.28.4 -- 2015-02-18
 --------------------
 

README.md

@@ -1,8 +1,7 @@
 Windshaft-CartoDB
 ==================
 
-[![Build Status](http://travis-ci.org/CartoDB/Windshaft-cartodb.png)]
-(http://travis-ci.org/CartoDB/Windshaft-cartodb)
+[![Build Status](https://travis-ci.org/CartoDB/Windshaft-cartodb.svg?branch=master)](https://travis-ci.org/CartoDB/Windshaft-cartodb)
 
 This is the CartoDB map tiler. It extends Windshaft with some extra
 functionality and custom filters for authentication

docs/Map-API.md

@@ -789,7 +789,8 @@ It is important to note that generated images are cached from the live data refe
 ####Limits
 
 * While images can encompass an entirety of a map, the default limit for pixel range is 8192 x 8192.
-* Resolution limitations for jpegs are at default a quality of 85. Limitations for quality are restricted to a maximum of XXX dpi.
+* Image resolution by default is set to 72 DPI
+* JPEG quality by default is 85% 
 * Timeout limits for generating static maps are the same across the CartoDB Editor and Platform. It is important to ensure timely processing of queries.
 
 

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.28.5",
+  "version": "1.28.6",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
@@ -181,8 +181,8 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.37.4",
-      "from": "windshaft@~0.37.4",
+      "version": "0.37.5",
+      "from": "windshaft@~0.37.5",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",

package.json

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