[mapcache] 02/08: Merge tag 'upstream/1.6.0'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapcache.

commit a788c3e85cd210161fe6944fb729f0b897906f46
Merge: 621cb2a 6c6a650
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Apr 13 18:46:56 2017 +0200

    Merge tag 'upstream/1.6.0'
    
    Upstream version 1.6.0

 .travis.yml                          |  56 +++
 CMakeLists.txt                       |  24 +-
 MIGRATION_GUIDE.txt                  |  16 +
 apache/mod_mapcache.c                | 245 ++++++------
 cgi/mapcache.c                       |   5 +-
 include/mapcache-config.h.in         |   4 +-
 include/mapcache.h                   | 715 +++++++---------------------------
 include/mapcache_services.h          | 162 ++++++++
 lib/buffer.c                         |   1 -
 lib/cache.c                          | 159 ++++++++
 lib/cache_bdb.c                      |  29 +-
 lib/cache_composite.c                |  95 ++++-
 lib/cache_couchbase.c                |  27 +-
 lib/cache_disk.c                     | 119 ++++--
 lib/cache_fallback.c                 |  51 ++-
 lib/cache_memcache.c                 |  36 +-
 lib/cache_multitier.c                |  40 +-
 lib/cache_rest.c                     | 643 +++++++++++++++++++++++--------
 lib/cache_riak.c                     | 174 ++++-----
 lib/cache_sqlite.c                   |  73 +++-
 lib/cache_tiff.c                     | 607 +++++++++++++++++++++++++++--
 lib/cache_tokyocabinet.c             |  17 +-
 lib/configuration.c                  |   4 +-
 lib/configuration_xml.c              | 237 ++++++------
 lib/connection_pool.c                |   4 +-
 lib/core.c                           |   8 +-
 lib/dimension.c                      | 726 +++++++++++++++++++----------------
 lib/grid.c                           |  61 ++-
 lib/http.c                           |   6 +-
 lib/image.c                          |  29 +-
 lib/imageio_jpeg.c                   |  15 +-
 lib/imageio_mixed.c                  |   6 +-
 lib/imageio_png.c                    |   2 +-
 lib/lock.c                           | 127 ++++--
 lib/service_demo.c                   | 167 ++++----
 lib/service_kml.c                    |   8 +-
 lib/service_mapguide.c               |   2 +-
 lib/service_tms.c                    | 270 ++++++++-----
 lib/service_ve.c                     |  26 +-
 lib/service_wms.c                    | 171 +++------
 lib/service_wmts.c                   | 174 +++------
 lib/services.c                       |   9 +
 lib/source.c                         |  55 +++
 lib/source_dummy.c                   |  17 +-
 lib/source_fallback.c                | 165 ++++++++
 lib/source_gdal.c                    | 723 +++++++++++++++++++++++++++-------
 lib/source_mapserver.c               | 143 +++----
 lib/source_wms.c                     |  63 +--
 lib/tileset.c                        | 416 ++++++++++++++++----
 lib/util.c                           | 120 +++++-
 mapcache.xml.sample                  |  26 ++
 nginx/ngx_http_mapcache_module.c     |   5 +-
 tests/data/world.tif                 | Bin 0 -> 702072 bytes
 tests/expected/wms_capabilities.xml  |  75 ++++
 tests/expected/wmts_capabilities.xml | 247 ++++++++++++
 tests/run_tests.sh                   |  49 +++
 tests/travis_setup.sh                |  65 ++++
 util/mapcache_seed.c                 | 434 ++++++++++++++-------
 58 files changed, 5421 insertions(+), 2532 deletions(-)

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