[cmor] 02/08: Merge tag 'upstream/3.2.6' into debian/master

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/3.2.6-1
in repository cmor.

commit 736e1d15bf79f08d2b96067e6a01f5053f305be8
Merge: f72585e 62db557
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Sep 9 16:41:50 2017 +0100

    Merge tag 'upstream/3.2.6' into debian/master

 INSTALL                                            |    4 +-
 Lib/__init__.py                                    |    2 +-
 Lib/pywrapper.py                                   |   11 +-
 LibCV/PrePARE/PrePARE.py                           |   13 +
 README.md                                          |    2 +-
 RELEASE-NOTES                                      |    1 +
 Src/_cmormodule.c                                  |   25 +
 Src/_controlvocabulary.c                           |   16 +-
 Src/cmor.c                                         |  495 ++---
 Src/cmor_CV.c                                      |  453 +++--
 Src/cmor_axes.c                                    |   12 +-
 Src/cmor_tables.c                                  |    5 +-
 Src/cmor_variables.c                               |   58 +-
 Test/common_user_input_hier.json                   |   70 +
 Test/test_python_CMIP6_CV_hierarchicalattr.py      |   84 +
 TestTables/CMIP6_3hr.json                          |   34 +-
 TestTables/CMIP6_6hrLev.json                       |    6 +-
 TestTables/CMIP6_6hrPlev.json                      |    4 +-
 TestTables/CMIP6_6hrPlevPt.json                    |   24 +-
 TestTables/CMIP6_AERday.json                       |    6 +-
 TestTables/CMIP6_AERhr.json                        |    8 +-
 TestTables/CMIP6_AERmon.json                       |   18 +-
 TestTables/CMIP6_AERmonZ.json                      |    8 +-
 TestTables/CMIP6_Amon.json                         |   10 +-
 TestTables/CMIP6_CF3hr.json                        |    8 +-
 TestTables/CMIP6_CFday.json                        |    4 +-
 TestTables/CMIP6_CFmon.json                        |    4 +-
 TestTables/CMIP6_CFsubhr.json                      |    8 +-
 TestTables/CMIP6_CV.json                           | 1845 ++++---------------
 .../{CMIP6_CV.json => CMIP6_CV_hierarchical.json}  | 1894 ++++----------------
 TestTables/CMIP6_E1hr.json                         |    4 +-
 TestTables/CMIP6_E1hrClimMon.json                  |    4 +-
 TestTables/CMIP6_E3hr.json                         |   10 +-
 TestTables/CMIP6_E3hrPt.json                       |   36 +-
 TestTables/CMIP6_E6hrZ.json                        |    6 +-
 TestTables/CMIP6_Eday.json                         |   22 +-
 TestTables/CMIP6_EdayZ.json                        |    6 +-
 TestTables/CMIP6_Efx.json                          |   10 +-
 TestTables/CMIP6_Emon.json                         |  194 +-
 TestTables/CMIP6_EmonZ.json                        |    6 +-
 TestTables/CMIP6_Esubhr.json                       |    6 +-
 TestTables/CMIP6_Eyr.json                          |    4 +-
 TestTables/CMIP6_IfxAnt.json                       |    4 +-
 TestTables/CMIP6_IfxGre.json                       |    4 +-
 TestTables/CMIP6_ImonAnt.json                      |    6 +-
 TestTables/CMIP6_ImonGre.json                      |    6 +-
 TestTables/CMIP6_IyrAnt.json                       |    4 +-
 TestTables/CMIP6_IyrGre.json                       |    4 +-
 TestTables/CMIP6_LImon.json                        |   16 +-
 TestTables/CMIP6_Lmon.json                         |    4 +-
 TestTables/CMIP6_Oclim.json                        |    4 +-
 TestTables/CMIP6_Oday.json                         |    4 +-
 TestTables/CMIP6_Odec.json                         |    6 +-
 TestTables/CMIP6_Ofx.json                          |    4 +-
 TestTables/CMIP6_Omon.json                         |  888 +++------
 TestTables/CMIP6_Oyr.json                          |  466 +----
 TestTables/CMIP6_SIday.json                        |    4 +-
 TestTables/CMIP6_SImon.json                        |   76 +-
 TestTables/CMIP6_day.json                          |    6 +-
 TestTables/CMIP6_fx.json                           |   22 +-
 TestTables/CMIP6_grids.json                        |    4 +-
 configure                                          |   18 +-
 configure.ac                                       |    2 +-
 include/cmor.h                                     |    2 +-
 include/cmor_func_def.h                            |    4 +-
 scripts/CMIP6_CV_cron_github.sh                    |   21 +-
 scripts/conda_upload.sh                            |    8 +-
 scripts/createCMIP6CV.py                           |   19 +-
 68 files changed, 2073 insertions(+), 4973 deletions(-)

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