Merge branch 'master' into CDB-3497

Conflicts:
	Makefile
	NEWS
This commit is contained in:
Kartones
2014-07-29 14:16:52 +02:00
2 changed files with 8 additions and 3 deletions

View File

@@ -6,6 +6,7 @@ addons:
before_install:
- sudo apt-get update
#- sudo apt-get install -q postgresql-9.3-postgis-2.1
- sudo apt-get update
- sudo apt-get install -q postgresql-server-dev-9.3
- sudo apt-get install -q postgresql-plpython-9.3
# Install schema_triggers

10
NEWS
View File

@@ -1,6 +1,10 @@
0.3.2 (xxxx)
------------
* Splitting of CartodbfyTable method in subfunctions to be able to call in fragments and evade timeouts
0.3.3 (2014-07-xx)
------------------
* Splitting of CartodbfyTable method in subfunctions to be able to call in fragments and evade timeouts on hot zones
0.3.2 (2014-07-28)
------------------
* Make 0.3.0dev version upgradeable
0.3.1 (2014-07-22)
------------------