[mapcache] 03/12: Merge tag 'upstream/1.4.0'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapcache.

commit 7ca7c04cff15c9df3ad18e6bfa158bde6605c4b6
Merge: c5ed823 37181a9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 28 16:51:36 2015 +0200

    Merge tag 'upstream/1.4.0'
    
    Upstream version 1.4.0

 .gitignore                        |    2 +
 CMakeLists.txt                    |   19 +-
 Vagrantfile                       |   27 +
 apache/mod_mapcache.c             |  120 +++-
 cgi/mapcache.c                    |    2 +-
 cmake/FindRIAK.cmake              |   14 +
 include/mapcache-config.h.in      |    1 +
 include/mapcache.h                |  404 +++++++++++--
 lib/buffer.c                      |    1 +
 lib/cache_bdb.c                   |  213 +++----
 lib/cache_composite.c             |  205 +++++++
 lib/cache_couchbase.c             |  462 +++++++++++++++
 lib/cache_disk.c                  |   89 +--
 lib/cache_fallback.c              |  202 +++++++
 lib/cache_memcache.c              |  244 +++++---
 lib/cache_multitier.c             |  165 ++++++
 lib/cache_rest.c                  | 1165 +++++++++++++++++++++++++++++++++++++
 lib/cache_riak.c                  |  452 ++++++++++++++
 lib/cache_sqlite.c                |  551 ++++++++++--------
 lib/cache_tiff.c                  |  163 +++---
 lib/configuration.c               |   37 --
 lib/configuration_xml.c           |  115 +++-
 lib/connection_pool.c             |  190 ++++++
 lib/core.c                        |   38 +-
 lib/dimension.c                   |  376 +++++++-----
 lib/grid.c                        |   19 +-
 lib/hmac-sha.c                    |  413 +++++++++++++
 lib/http.c                        |  114 ++--
 lib/image.c                       |   19 +
 lib/imageio_png.c                 |  164 +++++-
 lib/lock.c                        |  364 +++++++++++-
 lib/service_mapguide.c            |    2 +-
 lib/service_tms.c                 |    2 +-
 lib/service_ve.c                  |    2 +-
 lib/service_wms.c                 |  117 +++-
 lib/service_wmts.c                |   38 +-
 lib/source_mapserver.c            |    1 +
 lib/source_wms.c                  |   15 +-
 lib/tileset.c                     |  138 +++--
 lib/util.c                        |  102 +++-
 mapcache.xml                      |   13 +-
 mapcache.xml.sample               |  107 +++-
 nginx/ngx_http_mapcache_module.c  |    4 +-
 scripts/vagrant/mapcache.sh       |   13 +
 scripts/vagrant/packages.sh       |   17 +
 scripts/vagrant/virtualbox-fix.sh |    5 +
 util/mapcache_seed.c              |  278 +++++----
 47 files changed, 6116 insertions(+), 1088 deletions(-)

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