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 |
|
Steve Harris
|
34a09ccfa2
|
Merge tag 'OB_16.2.1-22' into omaha_16.2.1
16.2.1-22
Former-commit-id: 08aeeb83301c68eee0b0c6e2558230f9590435de
|
2016-04-05 22:50:06 -05:00 |
|
Tim Jensen
|
98f6580c81
|
Omaha #5491: Fixed special case for QPFSCAN to be more strict
Change-Id: I4a27e78bef346f5514f37a48ff3c6c6d661a8e7d
Former-commit-id: 503bc9bcc6ffd0478b7d41071e1c9165a87a7ce6
|
2016-04-04 16:37:12 -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
|
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 |
|
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 |
|
Ron Anderson
|
fb62976c22
|
Merge "Omaha #5513 Fix TextWS GUIs opening on the wrong monitor" into omaha_16.2.1-lx
Former-commit-id: 1e9ff3fd1bca3a909d7b463567d11118a560cb38
|
2016-03-31 13:31:17 -05:00 |
|
Ron Anderson
|
a8233481db
|
Omaha #5513 Fix TextWS GUIs opening on the wrong monitor
Change-Id: Iac43fd6381267e2dac0009930318e22280a447f8
Former-commit-id: 5e56023bbf2aaf6a89254faeeb440d814782c391
|
2016-03-31 10:43:50 -05:00 |
|
Shawn.Hooper
|
3dfbcd2d48
|
Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Former-commit-id: 2bff69680159705f82c91292bc9a14a698b2edc1
|
2016-03-30 17:21:28 -04:00 |
|
Steve Harris
|
a5630ce465
|
Omaha #5229 - Revert Omaha #4716
Revert "Omaha #4716 Delta script to update stdtextproducts table."
This reverts commit d4f70ae9a0 [formerly 3ea23877757542c60932838efebd30f43cd6addb].
Revert "Omaha #4716 Use IcaoMap to determine a site's ICAO Id."
This reverts commit 47aedb4641 [formerly 7a3312b61227798136e962305a1439d2f47fc468].
Revert "Omaha #4716 Fix NPE."
This reverts commit 63a431de8d [formerly e46413899b050022d47e0294d2749a99274c6e56].
Revert "Omaha #4716 Triggers for ingest StdTextProducts now check for AWIPS PILs."
This reverts commit 235eea9437 [formerly 74c32b7cb7abc0036995228eb0d0a427e661026d].
Revert "Omaha #4716 Changes to textWS and textdb to support AWIPS ID."
This reverts commit 2227c881bd [formerly 882063e694dc8f36fee23598904a27a25e09a258].
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: fdf099dc4bef3411e435de3a67f82e15826d8073
|
2016-03-29 17:15:25 -05:00 |
|
Tim Jensen
|
d23b1f4f17
|
Omaha #5491: Add additional special case for QPFSCAN
Change-Id: I9c4e84314054a6913f7b067eab3808e5acadab94
Former-commit-id: 375ce5c253a37d6b5fce19ce4802e0186a07282c
|
2016-03-29 15:47:37 -05: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 |
|
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 |
|
Steve Harris
|
68c9c4cbeb
|
Merge tag 'OB_16.2.1-17' into omaha_16.2.1
16.2.1-17
Former-commit-id: 941159f28d89ce6f37844f2183c29d1593797968
|
2016-03-28 16:58:04 -05: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 |
|
Mark Ruebens
|
76b751e635
|
Merge "ASM #18719 - WarnGen Polygons: Look into ways to improve exclusions of zones close to coast" into asm_16.2.1
Former-commit-id: cb15e111553ca226e39208717c60f0c9e76873c3
|
2016-03-25 09:10:46 -05:00 |
|
David Friedman
|
e376a30501
|
ASM #18719 - WarnGen Polygons: Look into ways to improve exclusions of zones close to coast
Change-Id: Iaf30609cf792fe1c41eb4ac77104bfc965bd863c
Former-commit-id: ee7a0220729afdc12326c9944d16c99c2b1bc5d9
|
2016-03-24 20:24:06 +00:00 |
|
Mark Ruebens
|
b58640661d
|
Merge "ASM #18763 - WMOHeader class regular expression causing problem for binary bulletin messages." into asm_16.2.1
Former-commit-id: 236089d2e0bdea84d9e851f3f5ed49e761104599
|
2016-03-23 11:20:59 -05:00 |
|
Michael Gamazaychikov
|
1ae621d90e
|
ASM #18763 - WMOHeader class regular expression causing problem for binary bulletin messages.
Change-Id: I3f1297ad5123c0be881df69a55688a96cd8266ac
Former-commit-id: f79ed66d6d6ce7252887b9c28be178ed2fb94abe
|
2016-03-23 09:52:43 -04:00 |
|