[thredds] 16/26: Merge branch 'upstream' into debian/master

[Alastair McKinstry]

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

mckinstry pushed a commit to branch ichec/master
in repository thredds.

commit 5bb07f3c89ad7370b16b2a445a73a7bd65e8f070
Merge: 9b772ca cd33671
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 8 11:14:21 2017 +0100

    Merge branch 'upstream' into debian/master

 .travis.yml                                        |    4 +-
 build.gradle                                       |   14 +-
 buildSrc/build.gradle                              |   71 +
 .../edu/ucar/build/ui/ToolsUiJnlpBaseTask.groovy   |  133 +
 .../ucar/build/ui/ToolsUiJnlpExtensionTask.groovy  |  108 +
 .../ucar/build/ui/ToolsUiJnlpBaseTaskSpec.groovy   |  131 +
 .../build/ui/ToolsUiJnlpExtensionTaskSpec.groovy   |  138 +
 .../build/ui/toolsUiJnlpBaseWithOptionals.jnlp     |   26 +
 .../build/ui/toolsUiJnlpBaseWithoutOptionals.jnlp  |   48 +-
 .../edu/ucar/build/ui/toolsUiJnlpExtension.jnlp    |   16 +
 .../main/java/thredds/client/catalog/Catalog.java  |    2 +
 cdm/src/main/java/ucar/nc2/Dimension.java          |    4 +-
 .../java/ucar/nc2/dataset/CoordSysBuilder.java     |   26 -
 .../main/java/ucar/nc2/dataset/NetcdfDataset.java  |   48 +
 .../java/ucar/nc2/dataset/conv/M3IOConvention.java |    2 +-
 .../java/ucar/nc2/dataset/conv/WRFConvention.java  |    6 +-
 cdm/src/main/java/ucar/nc2/ncml/Aggregation.java   |   33 +-
 .../ucar/nc2/ncml/AggregationOuterDimension.java   |   33 +-
 .../main/java/ucar/nc2/ncml/AggregationUnion.java  |   34 +-
 cdm/src/main/java/ucar/nc2/ncml/NcMLReader.java    |   15 +-
 .../java/ucar/nc2/time/CalendarDateFormatter.java  |   65 +-
 .../resources/thredds/schemas}/wmsConfig.dtd       |    0
 cdm/src/test/data/ncml/testReadHttps.xml           |   40 +
 cdm/src/test/java/ucar/nc2/ncml/TestNcMLRead.java  |   12 +-
 .../ucar/nc2/time/TestCalendarDateFormatter.java   |   33 +-
 docs/internal/release.md                           |  116 +-
 .../reference/FeatureDatasets/Fmrc.html            |    4 +-
 .../reference/collections/FeatureCollections.html  |    2 +-
 .../tds/reference/collections/FmrcCollection.html  |    2 +-
 .../tutorial/FmrcFeatureCollectionsTutorial.html   |    4 +-
 docs/website/tds/tutorial/files/FmrcPoster.pdf     | 3217 ++++++++++++++++++++
 gradle/dependencies.gradle                         |   46 +-
 gradle/fatJars.gradle                              |    1 +
 gradle/testing.gradle                              |    2 +-
 gradle/wrapper/gradle-wrapper.properties           |    2 +-
 it/build.gradle                                    |    2 +-
 netcdf4/build.gradle                               |    6 +
 .../src/main/java/ucar/nc2/jni/netcdf/Nc4Iosp.java |   70 +-
 .../ucar/nc2/jni/netcdf/Nc4IospMiscSpec.groovy     |  111 +
 .../resources/ucar/nc2/jni/netcdf/DBP-690959.nc4   |  Bin 0 -> 428105 bytes
 .../resources/ucar/nc2/jni/netcdf/unsigned.cdl     |   23 +
 .../resources/ucar/nc2/jni/netcdf/unsigned.nc4     |  Bin 0 -> 14603 bytes
 opendap/dtswar/build.gradle                        |    2 +-
 .../src/main/java/opendap/dts/DTSServlet.java      |    7 +-
 .../main/java/opendap/servlet/AbstractServlet.java |   47 +-
 .../src/main/java/opendap/servlet/ReqState.java    |   78 +-
 .../main/java/ucar/nc2/dods/DODSNetcdfFile.java    |   33 +-
 .../java/ucar/nc2/dods/TestAxisAttrCombiner.java   |   57 +
 .../java/thredds/util/LoggerFactorySpecial.java    |   40 +-
 tds/README.txt                                     |   37 +-
 tds/build.gradle                                   |   56 +-
 .../java/thredds/server/config/TdsContext.java     |    5 -
 .../ncss/controller/AbstractNcssController.java    |    2 +-
 .../server/wms/config/WmsDetailedConfig.java       |    8 +-
 .../WEB-INF/classes/thredds/server/tds.properties  |    4 +-
 tds/src/main/webapp/WEB-INF/views/ToolsUI.jnlp     |   26 -
 tds/src/main/webapp/godiva2/godiva2.html           |   14 +-
 .../main/webapp/godiva2/img/new_logo_72dpi_web.png |  Bin 0 -> 12009 bytes
 udunits/build.gradle                               |    2 +-
 ui/build.gradle                                    |  137 +-
 ui/netCDFtoolsExtraJars.jnlp                       |   96 -
 61 files changed, 4688 insertions(+), 613 deletions(-)

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