Merge remote-tracking branch 'origin/develop' into segmentation

Conflicts: src/py/crankshaft/crankshaft/__init__.py
2016-06-29 17:09:14 +02:00
parent cfb58f7898 ab349fbdc0
commit 35b5612ded
20 changed files with 987 additions and 35 deletions
@@ -0,0 +1,10 @@
+SET client_min_messages TO WARNING;
+\set ECHO none
+_cdb_random_seeds
+
+(1 row)
+cartodb_id|trend_test|trend_up_test|trend_down_test|volatility_test
+1|t|t|t|t
+2|t|t|t|t
+3|t|t|t|t
+(3 rows)