[odb-api] 02/14: Merge tag 'upstream/0.17.4' into debian/master

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository odb-api.

commit eff8c108981060ace0e4c4cec4f97040787b23c1
Merge: 4157343 932fe09
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Nov 3 13:27:37 2017 +0000

    Merge tag 'upstream/0.17.4' into debian/master

 CMakeLists.txt                                     |   8 +-
 VERSION.cmake                                      |   2 +-
 eckit/VERSION.cmake                                |   2 +-
 eckit/src/eckit/cmd/KillCmd.cc                     |  12 +--
 eckit/src/eckit/filesystem/marsfs/MarsFSFile.cc    |  11 +-
 eckit/src/eckit/io/DataHandle.cc                   |  55 +++++++++-
 eckit/src/eckit/io/DataHandle.h                    |  14 +--
 eckit/src/eckit/io/MultiHandle.cc                  |   6 +-
 eckit/src/eckit/io/MultiHandle.h                   |  10 +-
 eckit/src/eckit/linalg/SparseMatrix.cc             |   2 +-
 eckit/src/eckit/log/ProgressTimer.cc               |  13 ++-
 eckit/src/eckit/log/ProgressTimer.h                |   5 +-
 eckit/src/eckit/mpi/Request.cc                     |   4 +
 eckit/src/eckit/mpi/Serial.cc                      |  98 ++++++++---------
 eckit/src/eckit/mpi/SerialRequest.cc               |   1 +
 eckit/src/eckit/net/TCPServer.cc                   |  13 +--
 eckit/src/eckit/net/TCPServer.h                    |  11 +-
 eckit/src/eckit/net/TCPSocket.cc                   |  81 +++++++++++---
 eckit/src/eckit/net/TCPSocket.h                    |   2 +-
 eckit/src/eckit/option/FactoryOption.h             |   1 +
 eckit/src/eckit/option/VectorOption.h              |   1 +
 eckit/src/eckit/runtime/Application.cc             |   9 +-
 eckit/src/eckit/runtime/TaskInfo.cc                |   8 +-
 eckit/src/eckit/value/Value.h                      |  11 +-
 eckit/tests/filesystem/test_restarthandle.cc       |  39 ++++---
 eckit/tests/io/CMakeLists.txt                      |   2 +-
 eckit/tests/mpi/eckit_test_mpi.cc                  |  35 ++++++
 eckit/tests/value/CMakeLists.txt                   |  13 ++-
 metkit/VERSION.cmake                               |   2 +-
 metkit/src/metkit/MarsExpension.cc                 |   6 +-
 metkit/src/metkit/MarsLanguage.cc                  |   9 +-
 metkit/src/metkit/MarsLanguage.h                   |  36 ++++---
 metkit/src/metkit/MarsParser.cc                    |   4 +
 metkit/src/metkit/MarsParser.h                     |   8 ++
 metkit/src/metkit/MarsRequest.h                    |   2 +-
 metkit/src/metkit/Parameter.cc                     |   3 +
 metkit/src/metkit/Parameter.h                      |   7 +-
 metkit/src/metkit/types/TypeParam.cc               |  72 +++++++------
 metkit/src/tools/parse-mars-request.cc             |   9 +-
 odb/CMakeLists.txt                                 |  27 +++--
 odb/VERSION.cmake                                  |   2 +-
 odb/src/extras/ifsaux/module/.parkind1.F90.un~     | Bin 1070 -> 0 bytes
 odb/src/module/.odb_module.F90.un~                 | Bin 1969 -> 0 bytes
 .../.ipynb_checkpoints/Untitled-checkpoint.ipynb   |   6 ++
 odb_api/Untitled.ipynb                             | 105 ++++++++++++++++++
 odb_api/VERSION.cmake                              |   2 +-
 odb_api/bamboo/MACOSX-flags.cmake                  |   1 +
 odb_api/regressions/CMakeLists.txt                 |   8 ++
 odb_api/regressions/ODB-387-and-388.sh             |  54 ++++++++++
 odb_api/src/odb_api/Comparator.cc                  |  62 +++++++++--
 odb_api/src/odb_api/Comparator.h                   |  65 +++++++++---
 odb_api/src/odb_api/FileMapper.cc                  |  30 ++++--
 odb_api/src/odb_api/IteratorProxy.h                |   2 +
 odb_api/src/odb_api/MetaDataReaderIterator.h       |   2 +
 odb_api/src/odb_api/ReaderIterator.h               |   2 +
 odb_api/src/odb_api/SelectIterator.h               |   4 +-
 odb_api/src/odb_api/data/DataHandleFactory.cc      | 117 ---------------------
 odb_api/src/odb_api/data/DataHandleFactory.h       |  61 -----------
 odb_api/src/odb_api/data/FileHandleFactory.cc      |  30 ------
 odb_api/src/odb_api/data/FileHandleFactory.h       |  29 -----
 odb_api/src/odb_api/data/HttpHandle.cc             |  80 --------------
 odb_api/src/odb_api/data/HttpHandle.h              |  49 ---------
 odb_api/src/odb_api/data/HttpHandleFactory.cc      |  33 ------
 odb_api/src/odb_api/data/HttpHandleFactory.h       |  29 -----
 odb_api/src/odb_api/data/Makefile                  |   2 -
 odb_api/src/odb_api/data/MarsHandleFactory.cc      |  85 ---------------
 odb_api/src/odb_api/data/MarsHandleFactory.h       |  29 -----
 odb_api/src/odb_api/data/PartFileHandleFactory.cc  |  39 -------
 odb_api/src/odb_api/data/PartFileHandleFactory.h   |  29 -----
 odb_api/src/odb_api/ecml_verbs/ChunkHandler.cc     |   2 -
 odb_api/src/odb_api/tools/CompareTool.cc           |  22 ++--
 odb_api/src/odb_api/tools/CompareTool.h            |   6 +-
 odb_api/src/odb_api/tools/MDSetTool.cc             |   5 +-
 odb_api/tests/core/CMakeLists.txt                  |   2 +-
 odb_api/tests/core/test_decode_odb.cc              |   2 +-
 .../dhshome/data/partitions_info_test_stage.txt    |   0
 .../data/partitions_info_test_stage.txt.files      |   0
 odb_api/tests/sql/CMakeLists.txt                   |   3 +-
 78 files changed, 753 insertions(+), 900 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/odb-api.git