[pgrouting] 02/06: Merge tag 'upstream/2.2.1'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository pgrouting.

commit bf47991f5b7c9c5c5c184aae1601b745b5418109
Merge: 4bffed9 4e0e941
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Apr 19 07:51:56 2016 +0200

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1

 CMakeLists.txt                                     |   4 +-
 VERSION                                            |   2 +-
 doc/conf.py.in                                     |   2 +-
 doc/src/tutorial/custom_query.rst                  |   6 +-
 doc/test/utilities-any.result                      |   2 +-
 src/allpairs/src/johnson_driver.cpp                |   2 +-
 src/alpha_shape/src/alpha.c                        |   7 +-
 src/alpha_shape/src/alpha_drivedist.cpp            |  33 ++++--
 src/alpha_shape/test/pgtap/issue-544.sql           |  61 +++++++++++
 src/common/src/postgres_connection.c               |   2 +-
 src/dijkstra/src/dijkstraVia_driver.cpp            |   2 +-
 .../src/boost_interface_drivedist.cpp              |   2 +-
 src/mainpage.dox                                   |   2 +-
 src/withPoints/doc/doc-pgr_withPoints.queries      |  52 +++++-----
 src/withPoints/doc/doc-pgr_withPointsCost.queries  |  24 ++---
 src/withPoints/doc/doc-pgr_withPointsDD.queries    |   8 +-
 src/withPoints/doc/doc-pgr_withPointsKSP.queries   | 114 +++++++++------------
 .../src/one_to_one_withPoints_driver.cpp           |   3 +-
 src/withPoints/src/pgr_withPoints.cpp              |   8 +-
 src/withPoints/test/doc-pgr_withPoints.result      |  52 +++++-----
 src/withPoints/test/doc-pgr_withPointsCost.result  |  24 ++---
 src/withPoints/test/doc-pgr_withPointsDD.result    |   8 +-
 src/withPoints/test/doc-pgr_withPointsKSP.result   | 108 +++++++++----------
 tools/template/src/function1_driver.cpp            |   2 +-
 tools/testers/pg_prove_tests.sh                    |   1 +
 25 files changed, 292 insertions(+), 239 deletions(-)

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