v1.48
v1.50
Merge branch 'master' of https://github.com/BobSimons/erddap

Conflicts:
	WEB-INF/ConvertTable
	WEB-INF/ConvertTable.sh
	WEB-INF/GenerateOceanwatchThreddsXml
	WEB-INF/GenerateOceanwatchThreddsXml.sh
	WEB-INF/GenerateOceanwatchThreddsXmlBob
	WEB-INF/GenerateOceanwatchThreddsXmlBob.sh
	WEB-INF/GenerateOtterThreddsXml
	WEB-INF/GenerateOtterThreddsXml.sh
	WEB-INF/GenerateThredds1ThreddsXml
	WEB-INF/GenerateThredds1ThreddsXml.sh
	WEB-INF/GenerateThreddsXml
	WEB-INF/GenerateThreddsXml.sh
	WEB-INF/GridSaveAs
	WEB-INF/GridSaveAs.sh
	WEB-INF/MapViewer
	WEB-INF/MapViewer.sh
	WEB-INF/NetCheck
	WEB-INF/NetCheck.sh
	WEB-INF/ValidateDataSetProperties
	WEB-INF/ValidateDataSetProperties.sh
	WEB-INF/classes/com/cohort/array/Attributes.java
	WEB-INF/classes/com/cohort/array/PrimitiveArray.java
	WEB-INF/classes/com/cohort/array/StringArray.java
	WEB-INF/classes/com/cohort/array/StringComparatorIgnoreCase.java
	WEB-INF/classes/com/cohort/ema/EmaAttribute.java
	WEB-INF/classes/com/cohort/util/Calendar2.java
	WEB-INF/classes/com/cohort/util/File2.java
	WEB-INF/classes/com/cohort/util/Image2.java
	WEB-INF/classes/com/cohort/util/Math2.java
	WEB-INF/classes/com/cohort/util/ResourceBundle2.java
	WEB-INF/classes/com/cohort/util/String2.java
	WEB-INF/classes/com/cohort/util/Test.java
	WEB-INF/classes/com/cohort/util/TestUtil.java
	WEB-INF/classes/dods/dap/BaseTypePrimitiveVector.java
	WEB-INF/classes/dods/dap/BooleanPrimitiveVector.java
	WEB-INF/classes/dods/dap/BytePrimitiveVector.java
	WEB-INF/classes/dods/dap/DAS.java
	WEB-INF/classes/dods/dap/DDS.java
	WEB-INF/classes/dods/dap/Float32PrimitiveVector.java
	WEB-INF/classes/dods/dap/Float64PrimitiveVector.java
	WEB-INF/classes/dods/dap/Int16PrimitiveVector.java
	WEB-INF/classes/dods/dap/Int32PrimitiveVector.java
	WEB-INF/classes/dods/dap/PrimitiveVector.java
	WEB-INF/classes/dods/dap/Server/Operator.java
	WEB-INF/classes/dods/dap/Server/SDGrid.java
	WEB-INF/classes/dods/dap/Server/SDSequence.java
	WEB-INF/classes/dods/dap/Server/ServerMethods.java
	WEB-INF/classes/dods/dap/functions/Length.java
	WEB-INF/classes/dods/servers/sql/drds.java
	WEB-INF/classes/dods/servlet/DODSServlet.java
	WEB-INF/classes/dods/servlet/DummySink.java
	WEB-INF/classes/dods/servlet/GuardedDataset.java
	WEB-INF/classes/dods/servlet/MimeUtil.java
	WEB-INF/classes/dods/util/Getopts.java
	WEB-INF/classes/dods/util/SortedTable.java
	WEB-INF/classes/dods/util/iniFile.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/Browser.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/CWDataBrowser.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/MakeEmaWar.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/OneOf.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/Projects.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/Shared.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/TestAll.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/DataHelper.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/DoubleCenterGrids.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/FileNameUtility.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/FillGaps.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/GenerateThreddsXml.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/Grd.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/Grid.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/GridDataSet.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/GridDataSetOpendap.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/GridDataSetThredds.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/Matlab.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/NcHelper.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/Opendap.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/OpendapHelper.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/SaveOpendap.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/TwoGrids.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/griddata/WriteShapefile.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/hdf/HdfTag.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/hdf/HdfWriter.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/hdf/SdsReader.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/hdf/SdsWriter.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/netcheck/NetCheck.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/netcheck/NetCheckTest.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/netcheck/Touch.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/CacheOpendapStation.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/DigirHelper.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/DigirIobisTDSP.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/DigirObisTDSP.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/GroupVariable.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/Index.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/MakeErdJavaZip.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/NdbcMetStation.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/PointDataSet.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/PointDataSetFromStationVariables.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/PointIndex.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/PointSubsetFull.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/PointSubsetScaled.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/PointVectors.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/StoredIndex.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/Table.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/TableDataSet.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/TableXmlHandler.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/pointdata/TwoTable.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/sgt/Boundaries.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/sgt/CompoundColorMap.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/sgt/FilledMarkerRenderer.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/sgt/GSHHS.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/sgt/GSHHSNewOnHold.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/sgt/LandMask.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/sgt/PathCartesianRenderer.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/sgt/SgtGraph.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/sgt/SgtMap.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/sgt/SgtUtil.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/util/AttributedString2.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/util/ParseJSON.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/util/RegexFilenameFilter.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/util/SSR.java
	WEB-INF/classes/gov/noaa/pfel/coastwatch/util/TestSSR.java
	WEB-INF/classes/gov/noaa/pfel/erddap/DasDds.java
	WEB-INF/classes/gov/noaa/pfel/erddap/Erddap.java
	WEB-INF/classes/gov/noaa/pfel/erddap/GenerateDatasetsXml.java
	WEB-INF/classes/gov/noaa/pfel/erddap/LoadDatasets.java
	WEB-INF/classes/gov/noaa/pfel/erddap/RunLoadDatasets.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/AxisDataAccessor.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDD.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDGrid.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDGridAggregateExistingDimension.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDGridCopy.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDGridFromBinaryFile.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDGridFromDap.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDGridFromErddap.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDGridFromEtopo.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDGridFromFiles.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDGridFromNcFiles.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDGridSideBySide.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTable.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableCopy.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableCopyPost.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromAsciiFiles.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromAsciiService.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromAsciiServiceNOS.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromAwsXmlFiles.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromBMDE.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromDapSequence.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromDatabase.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromEDDGrid.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromErddap.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromFiles.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromHyraxFiles.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromMWFS.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromNOS.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromNWISDV.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromNcCFFiles.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromNcFiles.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromOBIS.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromPostDatabase.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromPostNcFiles.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromSOS.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromThreddsFiles.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromWFSFiles.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/GridDataAccessor.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/GridDataAllAccessor.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/GridDataRandomAccessor.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/OutputStreamFromHttpResponse.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/TableWriter.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/TableWriterAll.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/TableWriterAllWithMetadata.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/TableWriterDistinct.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/TableWriterDods.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/TableWriterDodsAscii.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/TableWriterEsriCsv.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/TableWriterGeoJson.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/TableWriterHtmlTable.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/TableWriterJson.java
	WEB-INF/classes/gov/noaa/pfel/erddap/dataset/TableWriterSeparatedValue.java
	WEB-INF/classes/gov/noaa/pfel/erddap/util/CfToFromGcmd.java
	WEB-INF/classes/gov/noaa/pfel/erddap/util/EDStatic.java
	WEB-INF/classes/gov/noaa/pfel/erddap/util/EDUnits.java
	WEB-INF/classes/gov/noaa/pfel/erddap/util/FishBase.java
	WEB-INF/classes/gov/noaa/pfel/erddap/util/HtmlWidgets.java
	WEB-INF/classes/gov/noaa/pfel/erddap/util/PersistentTable.java
	WEB-INF/classes/gov/noaa/pfel/erddap/util/Projects2.java
	WEB-INF/classes/gov/noaa/pfel/erddap/util/Subscriptions.java
	WEB-INF/classes/gov/noaa/pfel/erddap/util/TaskThread.java
	WEB-INF/classes/gov/noaa/pfel/erddap/util/messages.xml
	WEB-INF/classes/gov/noaa/pfel/erddap/variable/EDV.java
	WEB-INF/classes/gov/noaa/pfel/erddap/variable/EDVAlt.java
	WEB-INF/classes/gov/noaa/pfel/erddap/variable/EDVDepth.java
	WEB-INF/classes/gov/noaa/pfel/erddap/variable/EDVLat.java
	WEB-INF/classes/gov/noaa/pfel/erddap/variable/EDVLon.java
	WEB-INF/classes/gov/noaa/pfel/erddap/variable/EDVTime.java
	WEB-INF/classes/gov/noaa/pfel/erddap/variable/EDVTimeGridAxis.java
	WEB-INF/classes/gov/noaa/pfel/erddap/variable/EDVTimeStamp.java
	WEB-INF/classes/org/jdom/output/Format.java
	WEB-INF/lib/commons-compress.jar
	WEB-INF/lib/mail.jar
	WEB-INF/lib/netcdfAll-latest.jar
	WEB-INF/lib/postgresql.jdbc.jar
	download/changes.html
	download/grids.html
	download/setup.html
	download/setupDatasetsXml.html
	images/embed.html
	src/main/java/gov/noaa/pfel/coastwatch/netcheck/SftpTestFile
	src/main/webapp/WEB-INF/ConvertTable
	src/main/webapp/WEB-INF/DasDds
	src/main/webapp/WEB-INF/DoubleCenterGrids
	src/main/webapp/WEB-INF/GenerateDatasetsXml
	src/main/webapp/WEB-INF/GenerateOceanwatchThreddsXml
	src/main/webapp/WEB-INF/GenerateOceanwatchThreddsXmlBob
	src/main/webapp/WEB-INF/GenerateOtterThreddsXml
	src/main/webapp/WEB-INF/GenerateThredds1ThreddsXml
	src/main/webapp/WEB-INF/GenerateThreddsXml
	src/main/webapp/WEB-INF/GridSaveAs
	src/main/webapp/WEB-INF/MapViewer
	src/main/webapp/WEB-INF/NetCheck
	src/main/webapp/WEB-INF/ValidateDataSetProperties