Raul Ochoa 6bd967e9fb Merge branch 'master' into medusa-improvements ... Conflicts: lib/cartodb/server_options.js		2015-02-06 12:01:28 +01:00
..
cache	Remove beforeEach and afterEach, in combination with suite they are	2015-01-30 16:50:06 +01:00
cache_validator.js	Put VarnishEmu in its own module	2012-10-05 16:24:35 +02:00
health_check.js	Remove beforeEach and afterEach, in combination with suite they are	2015-01-30 16:50:06 +01:00
multilayer.js	test to validate it's not possible to override authorization	2015-02-05 16:47:37 +01:00
named_layers.js	A non empty datasource from MapConfigNamedLayersAdapter.getLayers	2015-02-04 19:31:20 +01:00
server.js	Starts using mapnik 2.3.x via windshaft upgrade	2014-09-24 15:54:13 +02:00
templates.js	Adds a template test with http layer	2015-02-04 18:57:46 +01:00