xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
45004 commits 31 branches 40 tags 3.8 GiB
Commit graph

599 commits

Author SHA1 Message Date
Michael James
e3d3355c29 unscrew that screwy merge 2016-09-13 12:58:48 -06: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
Ying-Lian.Shi
64ed3331b8 ASM #19157 GFE: Add 3 foot option for Inundation Height for TCStormSurgeThreat values 
Change-Id: Ib7b4fb7ed96192047a8b947da4e41064a85f2d49
 2016-08-30 13:07:03 -05:00
Ying-Lian.Shi
da83fad13e ASM #19157 GFE: Add 3 fot option for Inundation Height for TCStormSurgeThreat values 
Change-Id: I3bc72e47305da6407bbd0cc02b1e8797e52fe6fe
 2016-08-30 13:01:53 -05:00
mjames-upc
51d96088e2 ufpy->awips 
Former-commit-id: 7cf8ba6f023a28b31012f523863fc374d91842ac
 2016-06-27 17:02:26 -05:00
David Gillingham
5a17aaff86 Omaha #5702 - Fix spelling error in CTA for HF.W. 
Change-Id: I452dad5f282fd8d917ec98fa68da5a26dd83f49d

Former-commit-id: 9c7c801918ab184f461b10872deada5abb28cb2d
 2016-06-17 10:23:07 -05:00
Shawn.Hooper
440020fd01 Merge remote-tracking branch 'origin/master_16.2.2' into asm_16.2.2 
Former-commit-id: dd65faae9109958e2948179be494caad62be29ee
 2016-06-13 11:38:26 -04:00
Rici.Yu
4595e6fde7 ASM #19096 - change masks to boolean arrays 
Change-Id: I94ac8f4150e4b84c3ba42451f2674a421eccd15f

Former-commit-id: fa83ddc0c55999f408c6b0587823b17605c3004b
 2016-06-08 15:44:08 -04:00
Shawn.Hooper
105e4a5ceb Merge branch 'master_16.2.1-p1-lx' into master_16.2.2 
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/extremeWindWarningFollowup.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm

Change-Id: I9093801630eb7c345d0ba69e684943798fb0b5d9

Former-commit-id: 8a4b0527806a73c69dc9be22e7aa1025fcb4b617
 2016-06-08 10:55:30 -04:00
mjames-upc
407259c472 show GFE config scripts; add nhadomain and stormsurgeww maps from origin/ncep_16.1.4-n 2016-06-03 13:38:51 -05: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
Rici.Yu
047cd1003d ASM #18967 - Remove contours plotted over ProposedWatches grid after running ViewWCL 
Change-Id: I9350247111463a78c6e83c987bef306ee9f92397

Former-commit-id: 1afa90016cda1522de6ef33c1502ec7680f98bc1
 2016-05-06 16:37:30 -04:00
mjames-upc
a1b90f1b19 massive grid renaming incl. GFE 2016-05-03 16:14:14 -06: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
Shawn.Hooper
8f1d77ca35 Merge tag 'OB_16.2.1-23' into master_16.2.2 
16.2.1-23

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java

Change-Id: I9497704adcca5b6df8728b6124e310a709447061

Former-commit-id: 55fc99c303e27f17f488bf053805622714c9d69c
 2016-04-18 12:07:11 -04:00
Shawn.Hooper
b242d43c91 Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1 
Former-commit-id: e2a8661e635842cff765be990a56ba429a15b405
 2016-04-15 14:30:50 -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
David Gillingham
af2424d37e Omaha #5568 : More lenient handling of ScreenList attribute for GFE smart tools. 
Change-Id: Ib0d53bac7c01a8efdf588e168e90b6fcdc4e9983

Former-commit-id: 7d36b2608534b4daad27177c52ad279c1d3af444
 2016-04-13 11:04:35 -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
Ana Rivera
c4ffd03399 VLab Issue #17650 - Run_NWPS updates; fixes #17650 
Change-Id: Ia6f793c6c11038ba74b5dd8655ba0ab64ff112b4

Former-commit-id: cea23eef8a09b6d6138878f71a18f9042ef8286d
 2016-04-07 19:50:28 +00: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
Shawn.Hooper
0bc42475e7 Merge remote-tracking branch 'asm/asm_16.2.1' into master_16.2.1 
Former-commit-id: 084fe2964431a0db70ab3c7a46a10a603fab8361
 2016-04-04 14:43:27 -04:00
Bruce.Hundermark
6455ae61ad ASM #18804 - ISC_Discrepancies Tool not working in 16.2.1 
Change-Id: I6be501f29f0c9249dfa633b99bac4c066f2df888

Former-commit-id: f7d495ad53c58d06ba5826acb3ae8b20648feb58
 2016-04-04 16:40:48 +00:00
Shawn.Hooper
3e5559bf6d Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1 
Former-commit-id: 2d01487eb412cc66fdbd9b29dac7ce89d4152a84
 2016-03-31 17:33:36 -04:00
Shawn.Hooper
f1a75179bf ASM #18748 - Rename Populate_QPF_With_WPCHiRes_QPF.py to Populate_WPC_PQPF.py 
Change-Id: Ic027e62a99d6a18a5e995a698bef0ba5a0f2d8d7

Former-commit-id: eadcfa0407f7b3dbaa7e73df0bc067c6c9eb987b
 2016-03-31 16:19:32 -04:00
Steve Harris
9b151020b3 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2 
Conflicts:
	cave/com.raytheon.uf.viz.radarapps.rps/src/com/raytheon/uf/viz/radarapps/rps/RpsListEditorDlg.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java


Former-commit-id: 781bddc3e581ba0f9bdaf7fe5b218fd688dbafeb
 2016-03-31 15:04:17 -05:00
Steve Harris
4d49cc34e3 Merge tag 'OB_16.2.1-19' into omaha_16.2.1 
16.2.1-19


Former-commit-id: 2244a58be5ffc002562984784f7a5912db7c455b
 2016-03-30 20:50:27 -05:00
Matthew Howard
2f549c147a Merge "ASM #18804 ISC_Discrepancies Tool not working in 16.2.1" into asm_16.2.1 
Former-commit-id: 4100c24b9217e7b4b6d0d34e1e24dc5bcce00fcc
 2016-03-30 12:33:50 -05:00
Bruce.Hundermark
164436cf25 ASM #18804 ISC_Discrepancies Tool not working in 16.2.1 
Change-Id: I6324ecda15098914d9d95da5611db9ad408024ed

Former-commit-id: 801ba1ec4dd55678beb0e6b481d4ee5a68f8b718
 2016-03-30 16:37:47 +00:00
Shawn.Hooper
77dc4e9183 ASM #18748 - Updates to allow for proper storage and display of some PQPF/PPQPF data 
Change-Id: I552b828b40375d4a3c571e11ca0cfd424d90e4f6

Former-commit-id: 4fa957c1378fcf11845095319aa9c5dfb9253312
 2016-03-30 10:36:43 -04:00
Steve Harris
385401f9ae Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 445a3ae3da804f366c1162104640d8459ab650d0
 2016-03-28 17:31:59 -05:00
Rici.Yu
06f5343b02 ASM #18773 - additional changes 
Change-Id: I52a0386d069174f6f1ca5fcfd5bf60ddaf659e79
(cherry picked from commit 5a7d67fd7f [formerly 0f686d1ddd18c55a40e9f6aa57f4bbf55387d717])

Former-commit-id: 65b7ccc390c97d0d5d7f71806468abcae183cc5e
 2016-03-28 16:44:30 -04:00
Rici.Yu
5a7d67fd7f ASM #18773 - additional changes 
Change-Id: I52a0386d069174f6f1ca5fcfd5bf60ddaf659e79

Former-commit-id: 0f686d1ddd18c55a40e9f6aa57f4bbf55387d717
 2016-03-28 11:05:56 -04:00
mjames-upc
e2d9ba9a4c merge unidata_15.1.1 to unidata_16.1.4 
Former-commit-id: 0dc3df68aa76348b27e8ce208cb72d91467184c0
 2016-03-25 13:09:32 -05:00
Ron Anderson
2194870ee3 Omaha #4751 Fix errors in NDFD_QPF_Checks and BOIVerifyInfo 
Change-Id: I77a82aef4c329bfe668f7516af94c112de002213

Former-commit-id: 820305de9be0454294914f3cc883f576659d52cb
 2016-03-25 09:22:11 -05:00
Rici.Yu
1b639a7435 ASM #18773 - BOIVerify fails after 16.2.1 numpy upgrade 
Change-Id: I879e282e97f1b014cd65b0e5109669e4a6ea8c5b
(cherry picked from commit 6426c0ecee [formerly e3021f826d8954a29a642556751a6b65e75802f1])

Former-commit-id: 4861385010533aabbfc69a17bb42b575c55efb01
 2016-03-24 13:22:24 -04:00
Rici.Yu
6426c0ecee ASM #18773 - BOIVerify fails after 16.2.1 numpy upgrade 
Change-Id: I879e282e97f1b014cd65b0e5109669e4a6ea8c5b

Former-commit-id: e3021f826d8954a29a642556751a6b65e75802f1
 2016-03-24 09:35:48 -04:00
mjames-upc
8930e12dec ufpy->python-awips; no longer building thrift or dynamicserialize RPMs 
Former-commit-id: d0068c97dd
 2016-03-16 18:51:24 -05:00
Ron Anderson
a9814cb27d Omaha #5411 More mixed case changes 
Change-Id: I4e2ebba857e219b62a9a4ba90328fb6c548899ca

Former-commit-id: e15de8abb00fcd1139eed97a13e2d917b1fdbf65
 2016-03-14 13:58:16 -05:00
Ron Anderson
5b8ea584ae Omaha #5411 More mixed case changes 
Change-Id: If71742bce09174f96fd14dd1029ec2a74dc23b6f

Former-commit-id: b252a62f107c4ea219a9594ce035399d092c9664
 2016-03-11 09:11:33 -06:00
Ron Anderson
a9414cc179 Omaha #5411 One more mixed case fix for PFM and autotest updates 
Change-Id: I0186bf9f99fdd52d12b2b0056055dbdb330850d5

Former-commit-id: 0265319a039c33a9e8d278ec3c02fce5243bcceb
 2016-03-03 10:47:21 -06:00
Ron Anderson
8bba15255b Omaha #5411 More mixed case changes to formatters 
Change-Id: Idab81706ce2c0678177d0fcbcdcc7dd756362e34

Former-commit-id: 000d546d3904b1047b728569f5f09b8fc7229eeb
 2016-03-03 09:50:23 -06:00
Ron Anderson
57f84c8f59 Omaha #5411 Additional changes to formatters and added mixed case check in OUPHandler. 
Change-Id: Iece6e5eb63dede9c1df120a6a26f14b96548c073

Former-commit-id: 8ba700bb99ba8c4aa290390deb7dc9e5ac94882b
 2016-03-01 17:37:59 -06:00
Steve Harris
c2b471a870 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2 
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitorDisplayThreshDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/TCVDictionary.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: a7340c2bf23cbc3d27ca52fbf2ccd9c7d1cb09c2
 2016-02-29 13:39:42 -06:00
Shawn.Hooper
528fea0e4e Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1 
Former-commit-id: 44af64b6c2b7c08b29e21d0b2975cba0d15c5507
 2016-02-25 15:12:04 -05:00
Ron Anderson
21fce01ece Omaha #5374 Added sendWFOMessage to SmartScript 
(cherry picked from commit bc1f577171bd61624498d0df96ac1937ec1dab60 [formerly 0cc3bbdf6ca35a99532726de9f7fd9b6149dbf97])

 Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py


Former-commit-id: 1d4f3721d21481ed2e084cd72e95479e3e2e2bb5
 2016-02-25 09:59:55 -06:00