Merge branch 'release/v2.0' into develop

Conflicts: NEWS.md
2012-11-30 16:53:55 +01:00
parent 69508f05d7 e813209768
commit de1df4f33c
3 changed files with 3 additions and 5 deletions
@@ -21,7 +21,7 @@
        "cluster2": "git://github.com/CartoDB/cluster2.git#cdb_production",
        "node-varnish": "0.1.1",
        "underscore"  : "~1.3.3",
-        "grainstore"  : "~0.10.7",
+        "grainstore"  : "~0.10.8",
        "windshaft"  : "~0.8.0",
        "step": "0.0.x",
        "generic-pool": "1.0.x",