Commit graph

5134 commits

Author SHA1 Message Date
Michael Gamazaychikov
adfd8dbbd9 ASM #18849 - Total Lightning (ENTLN) Unknown flash type Error.
Change-Id: Idb0aad98181d2b1f0044009a4aa598989e3cb584

Former-commit-id: b873923f3f49f5050b4323844a9a0c89fee0f51f
2016-04-22 10:00:53 -04: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
Shawn.Hooper
a04ce81194 Merge branch 'master_16.2.1' into master_16.2.1-lx
Former-commit-id: 8d3abdd21d81692101552a436a6409e8e129334d
2016-04-21 17:38:01 -04:00
Shawn.Hooper
bb6f5af59a Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Former-commit-id: 40594745087a6db80b50882b68c76b6bf9a17bd0
2016-04-21 17:34:14 -04:00
Shawn.Hooper
4ed3b15b90 Merge tag 'OB_16.2.1-25' into asm_16.2.1
16.2.1-25


Former-commit-id: d31ac348c13fbb3db7b770852d04f1916129c48f
2016-04-21 13:55:46 -04:00
Ron Anderson
d73498e0d2 Merge "Omaha #5539 Fix GFE issues with Wx/Discretes with more than 128 Wx types" into omaha_16.2.2
Former-commit-id: d915f0be29067808469500ee645330177cefd9a8
2016-04-20 12:41:21 -05: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
David Lovely
ee53371ea7 Omaha #5594 Removed OBE Cave modifications from awips2-common-base to allow for NCEP Cave to successfully install.
Change-Id: Ib786a92e6707e59749874c3dd9214c36107d9f21

Former-commit-id: 87e7d44b2b647e5454899ffc270f125fb75fbf14
2016-04-20 10:45:43 -05:00
Shawn.Hooper
6e41b71969 Merge branch 'master_16.2.1' into master_16.2.1-lx
Former-commit-id: c220eaaf3fd9b6f2a76759c4c8fa8a4956e6b623
2016-04-19 15:40:08 -04:00
Shawn.Hooper
7e8a992530 Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Former-commit-id: 9d4d406ffe09c0c4b4f87ce66b332f9155673e9b
2016-04-19 15:13:28 -04:00
steve.naples
71a7817241 ASM #18865 : MPE - Gage does not display in correct HRAP grid cell.
Change-Id: I6f63fd8334dad8e0041729fbfbe2f07c091399f4

Former-commit-id: 26ec31aff601b4ad14cc78551a3b128e7b4eb9f4
2016-04-19 18:57:07 +00:00
Tim Jensen
85c854aa4e Omaha #5182 - Changed processorMap population to be done during processing instead of up front.
Change-Id: I22fbc67c57b3dae66c04026a6b88bb3dbca51e27

Former-commit-id: 76b1244537e8f3f9926ada57e3daec5dd25decb1
2016-04-19 13:33:06 -05:00
Steve Harris
4169a0b5bb Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Former-commit-id: fa8baf319e3b028238c3ac9508e2efb724a7dd7a
2016-04-18 20:52:34 -05:00
Steve Harris
669ab55945 Merge tag 'OB_16.2.1-23' into omaha_16.2.1
16.2.1-23


Former-commit-id: e8c189b1a3b4512f1e8990c794e80f5196270c71
2016-04-18 20:30:52 -05:00
Mark Ruebens
4519a4b4ef Merge "ASM #18884 - WarnGen Templates: Impact templates fail to run when source/basis bullet is not selected" into asm_16.2.1
Former-commit-id: b659a20accf5fafb2fae4e50422262edafd8a8bc
2016-04-18 14:13:55 -05:00
Shawn.Hooper
c76fb2ff2d ASM #18880 - WarnGen Templates: Fixes for a few case issues in Impact SVS
Change-Id: Ia6dc1c2dc1de956d895069b95909481d0916a778

Former-commit-id: ea972cbcfc1f4764ada203d456166e4ae039a90b
2016-04-18 13:53:46 -04:00
Shawn.Hooper
a0184670b2 ASM #18884 - WarnGen Templates: Impact templates fail to run when source/basis bullet is not selected
Change-Id: I60f8f239f3c3304d92acf88dcd7ee908dbb76890

Former-commit-id: cc91434f5e88879baddff8b781ee02df57f00800
2016-04-18 13:34:23 -04:00
Shawn.Hooper
c4e85ee05d Merge remote-tracking branch 'vlab/mdl_16.2.2' into master_16.2.2
Former-commit-id: d1f65286146a4ba0bd7434f3ee8cafecb023fbbc
2016-04-18 12:38:45 -04: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
Tim Jensen
173b91c59a Omaha #5488 - Fix deleted subscription notifications
(cherry picked from d10dc5444d [formerly 1ea33b16eabaf4cef0155a3389a70c0b9e31464a])

Change-Id: I3d7dec1153f163d085bcbfd8208b2c0a850a0b14

Former-commit-id: 87bc96e88a476323c9cd1bb92162e41facbb333e
2016-04-18 10:29:56 -05:00
Darrel Kingfield
ce423dd9c7 VLab Issue #17764 MRMS Purge Rule Update v1; fixes #17764
Change-Id: I0f3d9a76576ccb9e4da2f1b09db825fbdce801cb

Former-commit-id: d5879aa95e202daf1da8c2e1304848c7ebdb06e5
2016-04-15 13:28:39 -07:00
Shawn.Hooper
3d0fdac3e2 Merge branch 'master_16.2.1' into master_16.2.1-lx
Former-commit-id: 9fee2144e36d308c07a8673fa128f4f899d6945c
2016-04-15 16:02:03 -04:00
Tom Gurney
3d1bee4532 Omaha #5345 - Store SLP values as Pa, not hPa
Also update existing sea level pressure values stored in hdf5 files.

(cherry picked from commit b733a89e8a6a2804bab9faaeee72496d8a65fba1 [formerly 73606213c72ba86a2a0f96232b1d1471fb6bd1c4])
Change-Id: I6924acf4fbe3fba7057f69306d582fc5c368812e

Former-commit-id: a9f91757e4a9cc994b24c025d20aa63433e7c2f7
2016-04-14 16:03:04 -05:00
Shawn.Hooper
e7d7a5df40 Merge tag 'OB_16.2.1-23' into asm_16.2.1
16.2.1-23


Former-commit-id: 58689e4265e780a75c5e4c8e584afa27ea30e3f1
2016-04-14 14:15:39 -04:00
David Gillingham
c3303aa1d6 Omaha #5575 - Merge IFPClient changes to support sendWfoMessage.
Change-Id: Ia378f3378a2f64feda5d87fd412938e3a4f2bc2a

Former-commit-id: 0c527e9c161a3d6dd4769dc986cd49f7f5cfa964
2016-04-14 10:51:02 -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
Shawn.Hooper
5a1d490a64 Merge remote-tracking branch 'vlab/ohd_16.2.2' into master_16.2.2
Former-commit-id: 4a246ec324380e39c5006e74912fe005f76726e1
2016-04-13 13:26:00 -04:00
Dave Hladky
dfe22d3118 Omaha #5486 DoD cert loader script and class
Change-Id: I73b103e312ea988fdd0b0598896000822cc9057b
(cherry picked from commit 09872feb1a4bff8c0439617ceceb278bd8ca7f61 [formerly f5ef2a68eff96aa5a684fc69f8b6dd447c6b153c])

 Conflicts:
	edexOsgi/com.raytheon.uf.common.security/META-INF/MANIFEST.MF


Former-commit-id: f60ff18cef2f1a789a73ccc3c7b2200b07bb78f2
2016-04-12 17:11:55 -05: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
Steve Harris
86ffc87eb7 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Former-commit-id: fcaaa49c916d527fccb3505568c77cd7fd6f51dc
2016-04-11 15:37:49 -05:00
Shawn.Hooper
672be59626 Merge branch 'master_16.2.1' into master_16.2.1-lx
Former-commit-id: c7c025042c718217242254e2b3d3049931ca99f9
2016-04-11 15:23:45 -04:00
Paul Tilles
746cbde5ac VLab Issue #17691 - DCS 18497; fixes #17691
Change-Id: I172493bee4577954c30576fe95ee1b508457f75c

Former-commit-id: 14fb17f5fc2a6783f43d07c6e56e89bc75edf6b4
2016-04-11 19:05:15 +00:00
Shawn.Hooper
d374d0484b Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Former-commit-id: 6abdd866c7dfcea7aecb233b8a6e706bb7b18d99
2016-04-11 13:52:43 -04:00
Mark Ruebens
cd714e667b Merge "ASM #18864 - WarnGen Templates: Improve CTA parse strings to be case independent" into asm_16.2.1
Former-commit-id: a70ce7eb8a0d82a1a30e28b2511f1fa9ddbf835e
2016-04-08 15:50:54 -05:00
Shawn.Hooper
f029d157b0 ASM #18864 - WarnGen Templates: Improve CTA parse strings to be case independent
Change-Id: Idf063b4573af3cee87422302df6e4652930c4303

Former-commit-id: 67a56f936708501ec6b5fdc1d28605f6b27bc145
2016-04-08 16:30:07 -04:00
David Friedman
bca7604449 ASM #18763 - WMOHeader class regular expression causing problem for binary bulletin messages.
Change-Id: Ie123c0b57f385caf5274f013df472531123955e4

Former-commit-id: 04ba20921e4e691fe1675643aa62b520bf7ba3b7
2016-04-08 18:05:34 +00:00
Shawn.Hooper
8a618519ec Merge remote-tracking branch 'vlab/ohd_16.2.2' into master_16.2.2
Former-commit-id: c3a9e71a1dd7a971701ac3c157a8a7b2eb1f3182
2016-04-07 16:02:01 -04:00
Shawn.Hooper
563e2fbb4a Merge remote-tracking branch 'vlab/mdl_16.2.2' into master_16.2.2
Former-commit-id: c849fcfe6bbb76fcf17632e9ae9539211766111d
2016-04-07 16:01:56 -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
Michael Gamazaychikov
a12dc9b032 ASM #18763 - WMOHeader class regular expression causing problem for binary bulletin messages.
Change-Id: I2a5cb504d47850a085f98146d2a61df2c30538ea

Former-commit-id: a069dbfbedc91077363b4ee7838c9023541f77a7
2016-04-07 15:09:19 -04:00
Tim Jensen
8de9c6cac1 Omaha #5491: Fix NullPointerException in getRawGeometries
Change-Id: I5e105ca2d8bf7485d4eba08f55b4ac0f79d19ea0

Former-commit-id: ad14cf8f3ff765542d4e7b8f06b35fc9cce66e63
2016-04-07 13:49:37 -05:00
Richard Peter
12873364a5 Merge "Omaha #5488: Fix deleted subscription notifications" into omaha_16.2.2
Former-commit-id: 50409efd2e9e0bb12efea84a8edac474d65d4b53
2016-04-06 16:58:11 -05:00
Tim Jensen
d10dc5444d Omaha #5488: Fix deleted subscription notifications
Change-Id: I3d7dec1153f163d085bcbfd8208b2c0a850a0b14

Former-commit-id: 1ea33b16eabaf4cef0155a3389a70c0b9e31464a
2016-04-06 10:09:52 -05: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
Steve Harris
e2719ac948 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Former-commit-id: 5e8f5c6bc014369458edb5adccd98f1940c77b41
2016-04-05 23:06:41 -05:00