[osm2pgsql] 03/07: Merge tag 'upstream/0.88.0_rc1' into experimental

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository osm2pgsql.

commit acbb49c7899449b6e964901eefd707f5fd845262
Merge: 14b6678 0a8b63f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 11 10:20:58 2015 +0200

    Merge tag 'upstream/0.88.0_rc1' into experimental
    
    Upstream version 0.88.0~rc1

 .gitignore                                    |   5 +-
 AUTHORS                                       |   4 +-
 CONTRIBUTING.md                               | 102 ++++++++++++++
 Makefile.am                                   |  15 ++-
 README.md                                     |  25 +---
 configure.ac                                  |   2 +-
 docs/migrations.md                            |  15 +++
 geometry-builder.cpp                          |  57 ++++----
 node-persistent-cache.cpp                     |  89 ++++++------
 node-ram-cache.cpp                            |  53 +++++---
 node-ram-cache.hpp                            |  21 ++-
 options.cpp                                   |  14 +-
 pgsql-id-tracker.cpp                          | 153 ---------------------
 pgsql-id-tracker.hpp                          |  31 -----
 tagtransform.cpp                              |  52 ++++---
 tests/common-pg.cpp                           |  35 ++---
 tests/common-pg.hpp                           |   2 +
 tests/regression-test.py                      |   4 +-
 tests/test-middle-flat.cpp                    | 112 ++++++++++++++++
 tests/test-output-multi-line.cpp              |   2 -
 tests/test-output-multi-point-multi-table.cpp |   2 -
 tests/test-output-multi-point.cpp             |   2 -
 tests/test-output-multi-polygon.cpp           |   2 -
 tests/test-output-pgsql-tablespace.cpp        | 146 ++++++++++++++++++++
 tests/test-output-pgsql-z_order.cpp           | 186 ++++++++++++++++++++++++++
 tests/test-output-pgsql.cpp                   | 103 +++++++++++++-
 tests/test_output_pgsql_z_order.osm           |  75 +++++++++++
 27 files changed, 938 insertions(+), 371 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm2pgsql.git