[pyosmium] 02/08: Merge tag 'upstream/2.12.0'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository pyosmium.

commit 5babbd0c68d4d273c85c149fdf507527c6b99de2
Merge: ccb847d ad582ab
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Mar 20 18:30:27 2017 +0100

    Merge tag 'upstream/2.12.0'
    
    Upstream version 2.12.0

 .gitignore                   |   2 +
 CHANGELOG.md                 |  10 ++-
 README.md                    |  26 +++++-
 README.rst                   |   6 +-
 doc/intro.rst                |  16 ++--
 doc/ref_index.rst            |   2 +-
 doc/ref_osm.rst              |   4 +-
 doc/ref_osmium.rst           |   4 +-
 doc/ref_replication.rst      |  14 +++
 doc/reference.rst            |   1 +
 lib/generic_handler.hpp      |  30 +++----
 lib/index.cc                 |   2 +-
 lib/io.cc                    |  19 ++++-
 lib/merged_input.hpp         |  68 +++++++++++++++
 lib/osm.cc                   |  13 +--
 lib/osmium.cc                |  33 +++++++-
 lib/write_handler.hpp        |  68 +++++++++++++++
 osmium/replication/server.py |  93 ++++++++++++++++++--
 osmium/replication/utils.py  |  66 +++++++++++++++
 osmium/version.py            |   6 +-
 setup.py                     |   5 +-
 tools/pyosmium-get-changes   | 197 +++++++++++++++++++++++++++++++++++++++++++
 tools/pyosmium-up-to-date    | 191 +++++++++++++++++++++++++++++++++++++++++
 23 files changed, 819 insertions(+), 57 deletions(-)

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