Brian.Dyke
d4888adc0f
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 2ac30f6c22f47840e4d9
2014-10-02 10:24:04 -04:00
Brian.Dyke
31f073ee3a
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 97464ea1534bc465bfbd
2014-10-02 10:15:34 -04:00
dmsys
f704781f4f
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 9f4560c4808c3625cfec
2014-09-30 13:45:54 -04:00
Brian.Dyke
fce029653d
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: 46af1d08570a497fc015
2014-09-29 11:20:57 -04:00
Brian.Dyke
858cfa1078
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
...
Former-commit-id: 814b9a286941921f7db2
2014-09-26 15:15:57 -04:00
Brian.Dyke
0045c3100f
Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
...
Former-commit-id: bd983e1932586a504500
2014-09-26 11:47:38 -04:00
Shawn.Hooper
56cd6483ef
ASM #600 - WarnGen: template optional watch inclusion
...
Change-Id: I282e94236389a907326926a68e2ed810a00b9688
Former-commit-id: 831af82c23da77322fd0
2014-09-25 16:25:43 -04:00
Ron Anderson
df1d9f8b72
Issue #3648 Fix GridParmManager.d2dGridDataPurged() to use deallocateDb.
...
Change-Id: Id9bb73c54028615c33a61373d7b565a230867c1a
Former-commit-id: 34df50963e7020daa55a
2014-09-25 13:48:11 -05:00
Ana Rivera
043ec96c2d
VLab Issue #4836 - O&M RM14013; Update aKrtmaNDFD.xml; fixes #4836
...
Change-Id: I18d92482782e4c95cdd147d1edb1f65f3865b98f
Former-commit-id: c1b58f214f39fc13eb38
2014-09-25 18:18:21 +00:00
Baoyu Yin
e9e3ad94ab
VLab Issue #4553 - AWIPS2_DR_16047: An update for Bad rule in gridImageryStyleRules.xml for Convective Inhibition; fixes #4553
...
Change-Id: Ib4e566154c6b8282efb33464b850ff1f66a5e6d0
Former-commit-id: c9385c0912dea223412e
2014-09-25 09:44:21 -04:00
Ana Rivera
bb533d9ddd
VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
...
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297
Former-commit-id: 9a0e9b17f4535f254357
2014-09-24 20:11:29 +00:00
Benjamin Phillippe
c7d6c602bd
Issue #3560 Fixed slow memory leak in registry
...
Former-commit-id: 81870960e6fb8dc9fe7d
2014-09-24 14:36:34 -05:00
Brian.Dyke
b49b13f77e
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
Former-commit-id: 87fa32d2d44b418918d4
2014-09-24 11:05:37 -04:00
Ron Anderson
8d0d43a437
Issue #3648 Improve GFE error handling for getAllAvailableParms.
...
Change-Id: I13d41a3c231a56fe7d6fc4bc3cbfd96e1bdcdccf
Former-commit-id: c37618c16c429de3224f
2014-09-23 18:47:38 -05:00
Ron Anderson
b0bb1aba4b
Issue #3648 Change GFE version purging to be event driven.
...
Change-Id: I204a37535464d6d04dddd0614716dfe8f51ef40e
Former-commit-id: 580db71dc825a41ff9db
2014-09-23 13:43:14 -05:00
David Friedman
0ed1ce5726
ASM #15658 - WarnGen: inclusion of watch information in marine products
...
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead
Former-commit-id: 2ee1ebe72da6acf71a0a
2014-09-23 18:39:22 +00:00
Shawn.Hooper
77b4daa18e
ASM #16755 - Checkin fix for MPE and Hydro perspectives for Mike Duff
...
Change-Id: Ibd5d2caad16de2ab2a645b507c0e00bea61e9d5e
Former-commit-id: 94b3acd43799f6ff6d0a
2014-09-23 10:44:38 -04:00
Steve Harris
7aa6719ca2
Merge branch 'master_14.2.4' (14.2.4-12) into omaha_14.2.4
...
Former-commit-id: b1931ae7dc38daf108e6
2014-09-22 22:06:05 -05:00
Ron Anderson
12dbec98fd
Issue #3526 Fix errors found during testing in SS
...
Change-Id: Ic2a7f0b38f57fcae6b3fea904a457642472b2157
Former-commit-id: ba501a42105407eb6a71
2014-09-22 11:34:31 -05:00
Brian.Dyke
b94198ffb3
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 1018c65552c0dc990974
2014-09-19 16:59:12 -04:00
Brian.Dyke
75f3bb31d5
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 8d665b93b54db67c581c
2014-09-19 16:56:50 -04:00
Baoyu Yin
957c12653b
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen IBW templates and 14.2.1 template corrections; fixes #4796
...
Change-Id: Ieb4a6d68b48351deacbddda65f1ff53485c3402d
Former-commit-id: 28b7e8d6e28568cd8419
2014-09-19 15:02:23 -04:00
Brian.Dyke
9fc3eb20c1
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 9c33ae6d2c6ad8d500ef
2014-09-19 14:42:29 -04:00
Brian.Dyke
279f67ff54
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: e601d3fa517f49052445
2014-09-19 13:08:06 -04:00
Brian.Dyke
1c0d6624a3
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 57a361073de1c88f287a
2014-09-17 15:50:13 -04:00
Brian.Dyke
125760432b
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 0f6b0f3d9da155bbd8c1
2014-09-17 15:45:27 -04:00
Brian.Dyke
c2033ff569
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 97dfb04eb64bd417b313
2014-09-17 13:32:25 -04:00
Qinglu.Lin
4bce4db9ef
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5
Former-commit-id: 5e939996620e2be5afd8
2014-09-17 10:26:25 -04:00
Ana Rivera
ae6d0f5d64
Merge "VLab Issue #4723 - Ingest LambertConformal projection with two standard parallels using RegionalSat; fixes #4723 " into field_14.3.1
...
Former-commit-id: 536140f0212e66ced748
2014-09-16 08:05:51 -04:00
Steve Harris
eb0a05ab81
Merge branch 'master_14.3.1' (14.3.1-17) into omaha_14.3.1
...
Former-commit-id: 57f0a992d9d5c0049ba2
2014-09-15 21:13:56 -05:00
Jordan Gerth
898b371293
VLab Issue #4487 - Dim. DR 17313, Additional true color capabilities; fixes #4487
...
Change-Id: I701f302aa5958e89522208fd7915f5077cf97616
Former-commit-id: 8f5903920c86b34a2f70
2014-09-15 19:14:13 -05:00
Jordan Gerth
478c9db8d3
VLab Issue #4723 - Ingest LambertConformal projection with two standard parallels using RegionalSat; fixes #4723
...
Change-Id: I20b309f4e994259a54e6bdb2276bc09a6b60a885
Former-commit-id: 0b425f94ebd6eb692733
2014-09-15 16:30:22 -05:00
Xuezhi.Wei
0933440c37
ASM #648 fix for the top of the hour issue for hourlypp
...
Change-Id: I794837427ee6f8dbc615cbd010aeb662ccad9896
Former-commit-id: bca2affc4042719b2d5b
2014-09-15 18:14:54 +00:00
Stephen Gilbert
e7d21b0293
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
...
Former-commit-id: 440bddda4b5bf2ed644a
2014-09-15 13:20:34 -04:00
Brian.Dyke
54b26b3616
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 1541e4c255216f34fb25
2014-09-15 10:46:25 -04:00
Stephen Gilbert
2406f0786f
Merge branch 'ncep_14.2.1-n' into ncep_14.3.1
...
Conflicts:
cave/build/cave/customTargets.xml
edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNative.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties
Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6
Former-commit-id: 662436c2d5561b751e58
2014-09-11 11:14:33 -04:00
Ron Anderson
57a3542038
Issue #3592 Fixed several localization issue in GFE
...
Change-Id: I2e65649d490372b5c1738f07c79b5ed15885f8c7
Former-commit-id: b91141ef7b52e5636261
2014-09-09 16:10:53 -05:00
Brian.Dyke
fe85eb9f70
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: 01dfe503f53d9a3de6e4
2014-09-09 11:44:30 -04:00
Brian.Dyke
5415a4939a
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: af477df90e858b91d677
2014-09-08 14:54:16 -04:00
Matthew Howard
8e65a175fc
Merge "ASM #539 Multiple flag functionality for textdb is not working properly" into asm_14.3.1
...
Former-commit-id: fdfe97c6598ebfa3edce
2014-09-08 08:23:57 -05:00
Baoyu Yin
11f1e39b07
VLab Issue #4624 - AWIPS2_DR_17545 Volume Browser MMP units are wrong ; fixes #4624
...
Change-Id: I407cf142f9adfc7601b14e12e33223cf344b596c
Former-commit-id: 7f317934ac2c4a9fbe7c
2014-09-05 13:35:07 -04:00
Brian.Dyke
4220590613
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: 702dd65aa79e1ee22146
2014-09-05 11:13:12 -04:00
Brian.Dyke
cdd1e08ee3
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: 9f7fabb002d7407481ef
2014-09-05 10:57:14 -04:00
Ana Rivera
c77e5412a6
VLab Issue #4601 - Update to SMS DR #16720 ; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
...
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152
Former-commit-id: a8b04b8e636d48576930
2014-09-05 13:27:29 +00:00
Brian.Dyke
fa6b302ab6
Merge branch 'master_14.2.2' into master_14.2.3
...
Former-commit-id: d695dd0084043a95d35e
2014-09-03 21:14:27 -04:00
Brian.Dyke
3ddb5831a0
ASM #15697 - Fix Hydro Perspective Issue
...
Former-commit-id: cfe03adff6121a2d100f
2014-09-03 21:10:16 -04:00
Steve Harris
0ea6b72088
Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
...
Former-commit-id: afa45bf9190e869fa6c1
2014-09-03 15:22:00 -05:00
Stephen Gilbert
4abe38b3ac
VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n
...
AWW and Upper Air updates. Revert some RTS xml files
Change-Id: I4cc48defcea33b9008c9734c1c53a193d0ce94da
Former-commit-id: 75277cb03432dffe58c8
2014-09-03 14:33:37 -04:00
Richard Peter
1c05f1b459
Merge "Issue #3560 Registry objects not re-sent after fully sync" into omaha_14.2.4
...
Former-commit-id: af87813ea93de26efce6
2014-09-03 09:42:34 -05:00
Nate Jensen
a690b853bb
Merge "Issue #3572 Fixed getNumpy errors for Grid2DFloat" into omaha_14.2.4
...
Former-commit-id: c23071f48c0f35426ad0
2014-09-02 17:34:59 -05:00
