cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into pythonTimeout

Browse Source
This commit is contained in:
Simon Martín 2018-01-09 11:06:40 +01:00
commit d901e81119
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -31,10 +31,10 @@ before_install:
- sudo apt-get -y remove --purge postgis-2.2 - sudo apt-get -y remove --purge postgis-2.2
- sudo apt-get -y autoremove - sudo apt-get -y autoremove
- sudo apt-get -y install postgresql-9.5=9.5.2-3cdb3
- sudo apt-get -y install postgresql-server-dev-9.5=9.5.2-3cdb3
- sudo apt-get -y install postgresql-plpython-9.5=9.5.2-3cdb3
- sudo apt-get -y install postgresql-9.5-postgis-scripts=2.2.2.0-cdb2 - sudo apt-get -y install postgresql-9.5-postgis-scripts=2.2.2.0-cdb2
- sudo apt-get -y install postgresql-9.5=9.5.2-3cdb3 --allow-downgrades
- sudo apt-get -y install postgresql-server-dev-9.5=9.5.2-3cdb3
- sudo apt-get -y install postgresql-plpython-9.5=9.5.2-3cdb3 --allow-downgrades
- sudo apt-get -y install postgresql-9.5-postgis-2.2=2.2.2.0-cdb2 - sudo apt-get -y install postgresql-9.5-postgis-2.2=2.2.2.0-cdb2
- sudo apt-get install -q gdal-bin - sudo apt-get install -q gdal-bin
- sudo apt-get install -q ogr2ogr2-static-bin - sudo apt-get install -q ogr2ogr2-static-bin

1
NEWS.md
View File

@ -8,6 +8,7 @@ Announcements:
* Documentation updates for Docs repo issue #840, GPKG Export. * Documentation updates for Docs repo issue #840, GPKG Export.
* Fix SHP exports, now it uses "the_geom" column by default when a dataset has more than one geometry column. * Fix SHP exports, now it uses "the_geom" column by default when a dataset has more than one geometry column.
* Logging all errors * Logging all errors
* Fix postgres version in travis
## 1.47.1 ## 1.47.1