Merge branch 'master' into CDB-3686

Conflicts: package.json
2014-08-13 15:31:22 +02:00
parent 8255f3eb51 d1fb792709
commit f2541d8cae
8 changed files with 46 additions and 20 deletions
@@ -2,7 +2,7 @@
 var _ = require('underscore')
    , Step       = require('step')
    , Windshaft = require('windshaft')
-    , redisPool = require('redis-mpool')(global.environment.redis)
+    , redisPool = require('redis-mpool')(_.extend(global.environment.redis, {name: 'windshaft:cartodb'}))
    // TODO: instanciate cartoData with redisPool
    , cartoData  = require('cartodb-redis')(global.environment.redis)
    , SignedMaps = require('./signed_maps.js')