Commit graph

2874 commits

Author SHA1 Message Date
Kevin.Johnson
dcecf025a2 ASM #15672 - fixed script to allow for full path of input file to be passed
Change-Id: Id4d9b71aaa8fb5ba26f5fc940e43ad149305cbae

Former-commit-id: 5cf5cac9f7 [formerly 0982ab6536679921a6afdc85166fe57e92aeac63]
Former-commit-id: 355274e7ac
2014-10-07 14:55:41 -04:00
Kevin.Johnson
7d677d0023 ASM #15672 - Added initial field tested version of edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh
Change-Id: Ibbd6bcb2fb36c02418fb612436d7db5ba9f571a7

Former-commit-id: 4d8efeeb9a [formerly c36b732cc8057cf7b830de647998f679725760da]
Former-commit-id: 5a38528711
2014-09-25 10:50:07 -04: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: 1018c65552 [formerly 41a854146a3f4ab156b63e2ea24e60681fc586f2]
Former-commit-id: c0dc990974
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: 8d665b93b5 [formerly 8d5d8cdfd272f8000a6a21a4128998889eb2ab30]
Former-commit-id: 4db67c581c
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: 28b7e8d6e2 [formerly f077d3cd4084faf8ad7c8865e84df53e59a5db72]
Former-commit-id: 8568cd8419
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: 9c33ae6d2c [formerly e895f7927a95c2416c05953e131d9e0c6095beb3]
Former-commit-id: 6ad8d500ef
2014-09-19 14:42:29 -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: 57a361073d [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]
Former-commit-id: e1c88f287a
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: 0f6b0f3d9d [formerly 0813f96fbb673fdbbdb2c0f049ec722a80b212f9]
Former-commit-id: a155bbd8c1
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: 97dfb04eb6 [formerly 1f186fb314e78d93adefe03faaa71f348ee207c7]
Former-commit-id: 4bd417b313
2014-09-17 13:32: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: 536140f021 [formerly c7c530f99f8585817544db2d7be5b13d47c3e62e]
Former-commit-id: 2e66ced748
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: 57f0a992d9 [formerly 74d4b836dd8b2eb9a70cf772127d9b7eee23c1bf]
Former-commit-id: d5c0049ba2
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: 8f5903920c [formerly 1300009502bafd34fee13c8d21d65208b1069bda]
Former-commit-id: 86b34a2f70
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: 0b425f94eb [formerly baf75c177b595dcfb545436586c31d28080b8281]
Former-commit-id: d6eb692733
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: bca2affc40 [formerly 2d36b1b9ed31404ca9c9a4ecfdbf5f1e40c05b54]
Former-commit-id: 42719b2d5b
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: 440bddda4b [formerly 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3]
Former-commit-id: 5bf2ed644a
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: 1541e4c255 [formerly 8e4f6e96f7b70d6f2b7517f3f0695350506169c7]
Former-commit-id: 216f34fb25
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: 662436c2d5 [formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]
Former-commit-id: 561b751e58
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: b91141ef7b [formerly a5ef55df33009948fec139e7729dd53ae4251667]
Former-commit-id: 52e5636261
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: 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]
Former-commit-id: 3d9a3de6e4
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: af477df90e [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]
Former-commit-id: 858b91d677
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: fdfe97c659 [formerly 764e268bcccec4a805509a11fbd9c9f4e1860842]
Former-commit-id: 8ebfa3edce
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: 7f317934ac [formerly 0eb76fb764113196683d8ae771d7cf37ccc86495]
Former-commit-id: 2c4a9fbe7c
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: 702dd65aa7 [formerly 876c6fc4db3901fdcd8dd9a6fb343d2f65254569]
Former-commit-id: 9e1ee22146
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: 9f7fabb002 [formerly c1f870d9df7579741e5a1d79cdec77293115e968]
Former-commit-id: d7407481ef
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: a8b04b8e63 [formerly 084970f8445dbb6b76bbad84b5dc986d961d2383]
Former-commit-id: 6d48576930
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: d695dd0084 [formerly 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a]
Former-commit-id: 043a95d35e
2014-09-03 21:14:27 -04:00
Brian.Dyke
3ddb5831a0 ASM #15697 - Fix Hydro Perspective Issue
Former-commit-id: cfe03adff6 [formerly 82d7bbe6bf005e543e1ad6772c6a18024f1b0764]
Former-commit-id: 121a2d100f
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: afa45bf919 [formerly 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4]
Former-commit-id: 0e869fa6c1
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: 75277cb034 [formerly 72fa8af848f1452a517a62c6a54eae265a9ec8a1]
Former-commit-id: 32dffe58c8
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: af87813ea9 [formerly 5f9298d52d0a11775588ed3742f2c2d3f19da1d0]
Former-commit-id: 3de26efce6
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: c23071f48c [formerly 9e0f31fc6601a39938deeaf7e1c8ed8849e43288]
Former-commit-id: 0f35426ad0
2014-09-02 17:34:59 -05:00
Brian.Dyke
9e156775e5 Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
Former-commit-id: 14e64881a1 [formerly bc9f03426304e3bb194fbf7f356d8dd3816cd836]
Former-commit-id: fd8ad016ef
2014-09-02 16:32:54 -04:00
Brian.Dyke
e425e5bf8c Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 611e036e75 [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]
Former-commit-id: f0875e724f
2014-09-02 16:30:51 -04:00
Benjamin Phillippe
30f3289917 Issue #3560 Registry objects not re-sent after fully sync
Change-Id: Id38989cf953aacb985d627422c043f8768df2ed0

Former-commit-id: 955ac3a670 [formerly 15e57fc58bee1045c5574e4d66a727a672ac83cb]
Former-commit-id: 7265bf54c7
2014-09-02 14:46:50 -05:00
Qinglu.Lin
b32ea40289 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05

Former-commit-id: ae13ea419e [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]
Former-commit-id: 2374673f8d
2014-09-02 14:37:19 -04:00
Ron Anderson
c7fbca0298 Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce

Former-commit-id: 434d412882 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]
Former-commit-id: 46c62a1db6
2014-09-02 12:21:42 -05:00
Richard Peter
abc807850f Merge "Issue #3560 Fix for registry memory issue" into omaha_14.2.4
Former-commit-id: 0e29b2d17f [formerly 6789576e88de568c6014c29d099349cec40c7c74]
Former-commit-id: be2474da34
2014-09-02 12:15:38 -05:00
Benjamin Phillippe
12914fb1e5 Issue #3560 Fix for registry memory issue
Former-commit-id: 2da57d3bc2 [formerly a6e4a2cac4d6f9390c5181439a6c834db56a95c6]
Former-commit-id: ab8b2ef473
2014-09-02 10:00:35 -05:00
Dave Hladky
534b784843 Issue #3564 Allow for un-authenicated WFS HTTPS connections.
Change-Id: Ib144a570b2206b336aac0b9e8ebc00c9f096775a

Former-commit-id: 82fd7189b9 [formerly 7afe5332fcf41bbc8bb2411944584405f3ba686a]
Former-commit-id: 9c3b002990
2014-09-02 09:38:21 -05:00
Steve Harris
f7e39c9d6f Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
Former-commit-id: e7705c328e [formerly 09b94266f1f3aeaaa7fcf622487d751097d271a4]
Former-commit-id: 3b6a003884
2014-09-02 08:12:49 -05:00
Brian.Dyke
cbe59aded5 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 2c25f68437 [formerly f34bc4f81eb5ac92ef306f73f8c34243d3f78e31]
Former-commit-id: 6f3d0508e4
2014-08-29 10:19:02 -04:00
Baoyu Yin
cbc7d2813f VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563
Change-Id: I5f5c55486f209b89ecf276bb38d3d42c7f60d1d1

Former-commit-id: bfc550b378 [formerly 5189ae1c3ce12320045c431d9552036ea9272cef]
Former-commit-id: bf5bb1bacf
2014-08-29 10:17:54 -04:00
Ana Rivera
e033ed5546 VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1

Former-commit-id: 9af77831a6 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]
Former-commit-id: 160dabc4d1
2014-08-28 18:38:26 +00:00
David Friedman
ea1e9feb1d ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9

Former-commit-id: ea9230b37c [formerly 6bfa1d6662b00925814be7126592bbe340651649]
Former-commit-id: a2dfe8e8f6
2014-08-28 15:43:32 +00:00
Brian.Dyke
76bd6575b6 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: a24794ca7b [formerly 3909fa46a4efffabb09303f139bc36accc064a6d]
Former-commit-id: 47ae6015e5
2014-08-28 11:39:48 -04:00
Kiran.Shrestha
e38e3af172 ASM #539 Multiple flag functionality for textdb is not working properly
Change-Id: Iaae81cace051d97db464e6610d6fa94f86086fb8

Former-commit-id: 571f6fb8ea [formerly 0220801fc1747c7659e3db7cf734538fdda270ef]
Former-commit-id: f11699eddd
2014-08-28 10:05:41 -04:00
Baoyu Yin
8e88237eab VLab Issue #4554 - AWIPS2_DR_17469 Radar Digital Vertical Integrated Liquid wrongly capped at value of >60 kg*m^-2; fixes #4554
Change-Id: I78b45576bd2be9e3baa1f85da5a124de60842e3b

Former-commit-id: ebc018c7f6 [formerly 8d3b878a9c32b77e7bb19b087e7da8de492a4481]
Former-commit-id: 2d3589e7af
2014-08-28 09:50:26 -04:00
Baoyu Yin
01b3186495 VLab Issue #4553 - AWIPS2_DR_16047 Bad rule in gridImageryStyleRules.xml for Convective Inhibition; fixes #4553
Change-Id: I20f7aeb70828c27e1e6250c54f90f82b88390056

Former-commit-id: dc1b76a996 [formerly 3aabef4b96bfb848bb5201d8eac2681b3dc49c83]
Former-commit-id: a42c9f6bc2
2014-08-28 08:34:34 -04:00
Brian.Dyke
a08db8d73d Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]
Former-commit-id: e654318431
2014-08-27 11:19:19 -04:00
Brian.Dyke
3459e1fcbc Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 175f4e67c1 [formerly a6d5822b5cb5bb3aa62fcc95e980b08c685a3be3]
Former-commit-id: d168e371aa
2014-08-26 15:00:55 -04:00