Commit graph

2548 commits

Author SHA1 Message Date
Michael James
4a4c2df792 Merge remote-tracking branch 'remotes/origin/unidata_16.2.2' into unidata_16.2.2-osx
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/index.xml
	cave/com.raytheon.uf.viz.d2d.ui.upperair/plugin.xml
	cave/com.raytheon.uf.viz.dat.feature/feature.xml
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cm/AWIPS2_NWS/edex/gov.noaa.nws.ost.edex.plugin.binlightning/src/gov/noaa/nws/ost/edex/plugin/binlightning/BinLightningAESKey.java
	cm/AWIPS2_NWS/edex/gov.noaa.nws.ost.edex.plugin.binlightning/src/gov/noaa/nws/ost/edex/plugin/binlightning/BinLightningAESKey.properties
	edexOsgi/build.edex/deploy.edex.awips2/.project
	edexOsgi/build.edex/deploy.edex.awips2/.pydevproject
	edexOsgi/build.edex/esb/etc/centralRegistry.sh
	edexOsgi/build.edex/esb/etc/dataprovideragent.sh
	edexOsgi/com.raytheon.edex.plugin.binlightning/utility/edex_static/base/distribution/binlightning.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satFog.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satMoisture.xml
	edexOsgi/com.raytheon.uf.edex.binlightning.feature/.project
	rpms/awips2.core/Installer.localization/utility/cave_static/bundles/scales/States.xml
2016-11-01 13:21:00 -06:00
Michael James
6065d9a473 logback fix; mute stormsurge and ihadomain from gfe 2016-10-17 19:54:30 -05:00
Michael James
c3404f442d gfe-request svcBackup should warn and not error 2016-10-17 19:37:43 -05:00
Michael James
199a7d184c Merge remote-tracking branch 'origin/unidata_16.2.2' into unidata_16.1.5-osx-merge
Conflicts:
	.gitignore
	build/deploy.edex.awips2/esb/etc/ingestGrib.sh
	build/deploy.edex.awips2/esb/etc/request.sh
	cave/build/build.sh
	cave/build/cave/customTargets.xml
	cave/build/p2-build.xml
	cave/build/static/linux/cave/caveUtil.sh
	cave/build/static/linux/cave/run.sh
	cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisualization.java
	cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/dataprovider/rsc/DataProviderRsc.java
	cave/com.raytheon.uf.viz.collaboration.ui/localization/collaboration/config.xml
	cave/com.raytheon.uf.viz.d2d.nsharp/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpPaletteWindow.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNsharpObservedSoundingDialogContents.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/map/D2DNsharpMapResourceData.java
	cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml
	cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/ClearAction.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/TwoPanelLayoutMenuAction.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2DPerspectiveManager.java
	cave/com.raytheon.uf.viz.dat.feature/feature.xml
	cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
	cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/rsc/DataStoreResource.java
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/handler/ExportImageHandler.java
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
	cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/DispatchGraphicsTarget.java
	cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/strings/DrawStringEvent.java
	cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/bundles/satellite/GoesrLegacyProfileMap.xml
	cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profile-index.xml
	cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java
	cave/com.raytheon.uf.viz.truecolor.gl/src/com/raytheon/uf/viz/truecolor/gl/extension/GLTrueColorImagingExtension.java
	cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/help/SmartInit.html
	cave/com.raytheon.viz.gfe/help/localConfig.html
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/WindGustFromAlgorithm.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementBrowserDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ZoneDbResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.pointdata/localization/bundles/SurfaceColorTemp.xml
	cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSurface.xml
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/MetarPrecipResource.java
	cave/com.raytheon.viz.product.awips/awips.product
	cave/com.raytheon.viz.product.awips/developer.product
	cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
	cave/com.raytheon.viz.redbook/localization/bundles/Redbook.xml
	cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml
	cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductsImagery.xml
	cave/com.raytheon.viz.satellite/localization/menus/satellite/regionalSatellite.xml
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/edex/common.properties
	edexOsgi/build.edex/edex/developer.properties
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.bufrua/utility/common_static/base/purge/bufruaPurgeRules.xml
	edexOsgi/com.raytheon.edex.plugin.grib/resources/com.raytheon.edex.plugin.grib.properties
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/GFSProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/RAP13GribPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/RAP40GribPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid1440721.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.10.table
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.11.table
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.3.table
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.7.table
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.8.table
	edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/radar/radarsInUse.txt
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/dao/SatelliteDao.java
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/maritimeObscuredSkyIFR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/maritimeObscuredSkyLIFR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/maritimeObscuredSkySymVFR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/transparentMaritimeSky.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/transparentSkySym.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/transparentSkySym2.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.ohd/utility/edex_static/base/distribution/dhr.xml
	edexOsgi/com.raytheon.uf.edex.ohd/utility/edex_static/base/distribution/dpa.xml
	edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/decoder/CWAParser.java
	edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/areaNames.xml
	edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/creatingEntities.xml
	edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/physicalElements.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/GpdCliRequestHandler.py
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductRetriever.py
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductStorer.py
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/storeActivity.py
	installCAVE.sh
	installEDEX.sh
	javaUtilities/build.wes2bridge.utility/ant/setup.xml
	javaUtilities/build.wes2bridge.utility/build.xml
	localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/scalesInfo.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/awips2.cave/deploy.builder/build.sh
	rpms/awips2.core/Installer.common-base/component.spec
	rpms/awips2.core/Installer.database/component.spec
	rpms/awips2.core/Installer.edex-environment/edex/component.spec
	rpms/awips2.core/Installer.edex-environment/wes2bridge.files/build/build.sh
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.localization/component.spec
	rpms/awips2.core/Installer.localization/utility/cave_static/bundles/scales/WFO.xml
	rpms/awips2.core/Installer.maps-database/component.spec
	rpms/awips2.core/Installer.ncep-database/component.spec
	rpms/awips2.core/Installer.pgadmin/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/awips2.core/Installer.topo/component.spec
	rpms/awips2.core/Installer.version/component.spec
	rpms/awips2.core/deploy.builder/build.sh
	rpms/awips2.edex/Installer.edex-shapefiles/component.spec
	rpms/awips2.edex/Installer.edex/component.spec
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/awips2.shapefiles/Installer.edex-shapefiles/component.spec
	rpms/awips2.shapefiles/deploy.builder/build.sh
	rpms/awips2.upc/Installer.edex-upc/programs/edex
	rpms/awips2.upc/Installer.ldm/component.spec
	rpms/awips2.upc/Installer.ldm/patch/cron/awips
	rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
	rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
	rpms/build/common/lookupRPM.sh
	rpms/build/common/usage.sh
	rpms/build/i386/build.sh
	rpms/build/i386/buildEnvironment.sh
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/buildEnvironment.sh
	rpms/python.site-packages/Installer.cherrypy/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pmw/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.python-awips/component.spec
	rpms/python.site-packages/Installer.thrift/component.spec
	rpms/python.site-packages/Installer.tpg/component.spec
	rpms/python.site-packages/Installer.werkzeug/component.spec
	rpms/unidata/build.sh
	rpms/unidata/buildEnvironment.sh
	rpms/unidata/rsync.dirs
2016-09-13 10:44:13 -06:00
Ron Anderson
1b78418149 Omaha #5769 Mixed case fixes for SRF, SFT, FWF.
Change-Id: I908bd8256989d4e9a3964ba71b8c1645f60a0190
2016-08-30 13:10:25 -05:00
Ron Anderson
97389888c7 Omaha #5769 Fix mixed case issues in a few formatter. Improve reliablity of VTEC auto tests.
Change-Id: I31d24922fc5b760d268156ecba8b7fe46b04acba
2016-08-30 13:10:11 -05:00
mjames-upc
9af19839fa Merge branch 'omaha_16.2.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into unidata_16.2.2-omaha
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml

Former-commit-id: c80cc49c475d36a729078f16fd4bbd48195cd376
2016-07-05 11:25:59 -05:00
mjames-upc
51d96088e2 ufpy->awips
Former-commit-id: 7cf8ba6f023a28b31012f523863fc374d91842ac
2016-06-27 17:02:26 -05:00
Steve Harris
fd5adf5de1 Merge tag 'OB_16.2.2-17' into omaha_16.2.2
16.2.2-17


Former-commit-id: 7fc5e9726eb579d6fd99d3a6abad8d7cb7f3b99a
2016-06-23 09:57:49 -05:00
Ron Anderson
90953d4c64 Merge "Omaha #5703 - Allow null or empty requestedSiteIDs for GetSiteTimeZoneInfoRequest." into omaha_16.2.2
Former-commit-id: 4b654dd1531260715ba0196acf72ff8b77451c9f
2016-06-20 12:38:15 -05:00
David Gillingham
30bfc5ac91 Omaha #5700 - Fix captialization of bullets header text in Hazard_RFW.
Change-Id: I435e92bdb8bb754b4f860507d174a41fa2d697cc

Former-commit-id: 9334bdf404e24a80fee709b932afd734a11c1331
2016-06-20 12:07:08 -05:00
David Gillingham
23a84aa5c7 Omaha #5703 - Allow null or empty requestedSiteIDs for GetSiteTimeZoneInfoRequest.
Change-Id: I28c20262490de322ea0801245ca5e303f4f479af

Former-commit-id: 4cdbafd82b0eb075f1dda31c4ed660f5f4e2c812
2016-06-17 11:14:01 -05:00
David Gillingham
940e78ff4d Omaha #5701 - Fix captialization of impacts bullet in Hazard_RFW.
Change-Id: I859d5f0c3c5b04777063d587c34d44ee898fccb6

Former-commit-id: cae6d4021cd63c31edd6cb6f659caac1c8a5868d
2016-06-17 10:45:58 -05:00
Michael James
749e6e80fc Merge branch 'unidata_16.1.5' of https://github.com/Unidata/awips2 into unidata_16.1.5-osx 2016-06-16 08:55:32 -06:00
Bruce.Hundermark
8fd041c9a1 ASM #17308 Change in storage of LI products for some models results in GFE display problems
Change-Id: I049ab2628c7bb2d81240fe11d5b9126e5e3e9afe

Former-commit-id: fe3d8aa6b24bb5dd5aabf49334b4958e813588a0
2016-06-15 21:00:51 +00:00
Bruce.Hundermark
2edbf52196 ASM #17308 Change in storage of LI products for some models results in GFE display problems
Change-Id: Ib8cbbaee0842c45e01fbc29b95510db74be6a320

Former-commit-id: 30765dc56205cda8ada3b2c328f0f8746c8ae4cf
2016-06-14 14:56:13 +00:00
mjames-upc
59918c5fe4 addback vcmodule 2016-06-05 17:17:06 -05:00
mjames-upc
4b75ed07b4 Revert "use sectorID CONUS for NEXRCOMP"
This reverts commit 21aec4a21f.
2016-06-05 12:38:29 -05:00
mjames-upc
21aec4a21f use sectorID CONUS for NEXRCOMP 2016-06-03 15:33:10 -05:00
Michael James
f5f384d3ef Merge branch 'unidata_16.1.4' of https://github.com/Unidata/awips2 into unidata_16.1.4-osx 2016-06-02 21:31:25 -06:00
Michael James
2fbbef2892 capitalization nonsense on osx 2016-06-02 21:28:23 -06:00
Shawn.Hooper
59eb8c331b Merge remote-tracking branch 'asm/asm_16.2.2' into master_16.2.2
Conflicts:
	cave/build/static/linux/cave/caveUtil.sh

Change-Id: Ica141f8cc3fe6aa899f98c42b4596c73d9da3462

Former-commit-id: 217f6814116282bb404e87fce99048df552e1ca9
2016-06-01 15:04:16 -04:00
Rici.Yu
ac4b06261e ASM #19014 - Fix data rounding causing Td to be greater than T
Change-Id: Id021a4ddc4959423e9e6184d6707b0363612351d

Former-commit-id: cf774dbaa31261ca96eb643bd9b615448d2e19ab
2016-05-27 08:57:26 -04:00
mjames-upc
41e328f176 more build updates for 16.1.4-15 from moe 2016-05-18 09:33:18 -06:00
Steve Harris
ec8b83dd67 Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2
16.2.1-lx-29

 Conflicts:
	cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/SimpleLogViewer.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcFreezeOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcTempOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DeletePolygonDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/total/TotalLightningDecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SaveCombinationsFileHandler.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm


Former-commit-id: 17c68986a20e9a589d40407800dd52678fcda68b
2016-05-12 09:28:49 -05:00
Shawn.Hooper
8977a0a91c Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2
Former-commit-id: f45d120949051fa6ffe06b225a05571244042a73
2016-05-05 14:15:17 -04:00
mjames-upc
31c4b14eee Merge branch 'unidata_16.1.4' of github.com:Unidata/awips2 into unidata_16.1.4 2016-05-04 14:28:36 -06:00
mjames-upc
f087e01ee8 GFE serverConfig.py updates 2016-05-04 14:27:39 -06:00
mjames-upc
7eed48e4ac GFE perspective fixes and improvements for 16.1.5 2016-05-04 15:26:31 -05:00
mjames-upc
a1b90f1b19 massive grid renaming incl. GFE 2016-05-03 16:14:14 -06:00
Penghai Wang
3464ad6b11 Merge branch 'master_16.2.2' into asdt_16.2.2
Former-commit-id: 02133bf406abe2ba96c7037cbb30675de2e02918
2016-05-02 19:52:55 +00:00
Wen Kwock
ee1815802e VLab Issue #18043 - DR18896 NationBlend Version 2; fixes #18043
Change-Id: I90eb370ef148b93d0ac4e08dadcb8749015bf827

Former-commit-id: c519d651b10750d372b63b0dafb6ad924ac18f3d
2016-05-02 15:02:15 +00:00
Ron Anderson
c0c0999d90 Omaha #5618 Fix ifpClient to work with "chunked" grid requests.
Change-Id: Ide6043980fb2053de112d552f9421b4405f97364

Former-commit-id: 19345ec42d194026fe7019792f7dd280124a026d
2016-05-02 08:44:03 -05:00
Steve Harris
2dbf6c5246 Omaha #5229 - removed merge markings
Former-commit-id: e7b2f343af9e341265240e7694dc5252656a9b99
2016-04-28 15:53:08 -05:00
Ron Anderson
78016e80e7 Merge "Omaha #5605 Fix combinations file retrieval again" into omaha_16.2.1
Former-commit-id: 3357db152755bd86e958b19b3504811bb7efe1b2
2016-04-25 16:20:11 -05:00
Ron Anderson
8212a8ebd0 Omaha #5605 Fix combinations file retrieval again
Change-Id: I491ee8426bb6a22d9cdabe925c906d1c86777cb8

Former-commit-id: cd5be4eec18a9dc9453e0da3af301b7f5394e11f
2016-04-25 16:13:48 -05:00
Shawn.Hooper
6bfcb5eb57 Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2
Former-commit-id: 869b414c8476d6cfd22d74024e56d4ea7ee21e92
2016-04-21 17:41:35 -04:00
Ron Anderson
0ffd97f7d3 Omaha #5539 Fix GFE issues with Wx/Discretes with more than 128 Wx types
Change-Id: I8c66fdcbc8925c23863d6d1e0a8ec5fce67f87c8

Former-commit-id: 81a57e1d4d2062bfcf8acdcc92fbbab062fa9cbf
2016-04-20 11:25:33 -05:00
Mark Ruebens
d956304614 Merge "ASM #18888 - Add support for pre-TCV in TPCWatchSrv" into asm_16.2.1
Former-commit-id: 2cf77debf1c4f933a412beaa7bb1a480f43b8940
2016-04-14 06:54:19 -05:00
Shawn.Hooper
a659a4e664 ASM #18888 - Add support for pre-TCV in TPCWatchSrv
Change-Id: I83d16d6f1dc3b41894b448313ee67029ae1ea921

Former-commit-id: ad8f87339367fcacf1f4e29be902949a3f76e086
2016-04-13 18:12:02 -04:00
Shawn.Hooper
1b186554b7 Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java

Change-Id: I6cd12190f57f25ea433ce578559444c9f9a27965

Former-commit-id: 86ef513f00aaa0c06f66088cf2e67f25da788e57
2016-04-13 13:37:34 -04:00
Steve Harris
abaa61769f Merge tag 'OB_16.2.2-3' into omaha_16.2.2
16.2.2-3

 Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java


Former-commit-id: 55bc369bddace873c371d0b5b51c383b33c6ca3d
2016-04-12 16:14:15 -05:00
Shawn.Hooper
449307b46c Merge tag 'OB_16.2.1-22' into master_16.2.2
16.2.1-22


Former-commit-id: 102f706a27808f2627f3d9ed8c6be11e0dc978ee
2016-04-12 14:28:16 -04:00
Penghai Wang
1ff00e7088 Merge branch 'master_16.2.2' into asdt_16.2.2
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/DataIngestFilterDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml

Former-commit-id: 51bcd1df67c24bce021a89b8708e48306dd0691e
2016-04-12 16:45:34 +00:00
Nathan Bowler
5649628591 Omaha #5537 Update PWPF param names to include time period.
Change-Id: Ia6f6dc90706a3f85fc25be2fd7a45803b2c22839

Former-commit-id: b4582dc65b830df3f22d25b1052d4c59287262c3
2016-04-12 11:27:00 -04:00
Shawn.Hooper
0c2ce7faae Merge remote-tracking branch 'vlab/field_16.2.2' into master_16.2.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I0c91cd064aff06397abc6445837ef1be2610d740

Former-commit-id: 1f5a13ead40804f458617b9506236d819d97d54f
2016-04-07 16:01:19 -04:00
Steve Harris
2ba0e17ff0 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Former-commit-id: 23382d06b2bea731deef5b0a01b1b27bb187fb95
2016-04-05 23:14:48 -05:00
Rici.Yu
8c65f847d7 ASM #18777 - Remove IP addresses from serverConfig.py
Change-Id: I132b648afb3cef6dc0c26b1d4517c9835f4daf2c

Former-commit-id: 4c19cda4574f866285b659f7d4fbf8e41f2f5bd9
2016-04-01 10:19:22 -04:00
Shawn.Hooper
1cf2f19e65 Merge tag 'OB_16.2.1-17' into asm_16.2.2
16.2.1-17

Change-Id: I3cb4abf93fd7729ea54cbe4c8ecea781579c5db7

Former-commit-id: 17fb0b31a7377334925e852db6fabb7b223594dd
2016-03-29 16:43:12 -04:00
Shawn.Hooper
850ec358bf ASM #18528 - "Merge tag 'OB_16.2.2-1' into DCS-18528"
16.2.2-1

Change-Id: I7ac65cae4efe4e38b2c059aec6d4808f97f1bf77

Former-commit-id: 8173420a5e472738d4c9255d2ed32e55927c8d07
2016-03-28 15:47:44 -04:00