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
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
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
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
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
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
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
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
Shawn.Hooper
90220c0fd7
ASM #18748 - Updates to allow for proper storage and display of some PQPF/PPQPF data
...
Change-Id: Ia566f84a2311ee54b06f1101ce2fb47dfc76c9d8
Former-commit-id: 4fb2feee8ca09f499fecf0df047c63a0ea280c92
2016-03-22 16:15:24 -04:00
Steve Harris
3ce4378152
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ZoneDbResource.java
Former-commit-id: 6074ea5185430ae4b5c959b02c893d93cf414479
2016-03-16 09:43:23 -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
Tom Filiaggi
ce329fd5b1
VLab Issue #16465 - RipRisk in serverConfig.py; fixes #16465 .
...
Just a one-line fix.
Change-Id: I91db5378aff63a4b09ce91fa9440848fa642ba1c
Former-commit-id: 7c7162980b2174255569d11e042a20fea13ae936
2016-03-10 10:31:59 -07:00
Steve Harris
f50708c360
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
Former-commit-id: 764d87996608e1e0873a1336d81feafa98c312c8
2016-03-08 17:46:12 -06:00
Shawn.Hooper
768d7bb626
Merge tag 'OB_16.1.4-3' into master_16.2.1
...
16.1.4-3
Former-commit-id: 09588baffaabb1419369427ddc27266126d04956
2016-03-04 15:16:00 -05:00
Tom Filiaggi
7f535d31da
VLab Issue #15901 serverConfig.py update for NIC; fixes #15901
...
Change-Id: I340c945191d1ae94c1d3fbb9d4682c69bb03d6d3
Former-commit-id: bd65358cb955da3864bc73aee8ffb8e83a638009
2016-03-03 22:29:34 +00: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
David Friedman
d7ac171705
ASM #18528 - Merge remote branch 'origin/master_16.2.2' into HEAD
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Change-Id: Ie8a4ab8afd5eb80b714f0739bc8ac99fe0552be4
Former-commit-id: 95d232da9522aa1bc9bf738b027c32042eea797e
2016-02-29 20:35:54 +00: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
fe6159d631
ASM #17573 - TCV: additional fixes to handle default case in Hazard_TCV
...
Change-Id: Icdd2c00109caf1a9d9306b35d14f773568623a44
Former-commit-id: 012d70b27d646f893f4a8ab11ac7283450ff0695
2016-02-26 16:19:55 -05:00
Shawn.Hooper
ffa9a5603c
Merge tag 'OB_16.1.2-22' into master_16.2.1
...
16.1.2-22
Former-commit-id: 76aec34b914155d7072b994dc25fa9bb900d2c9f
2016-02-25 15:15:03 -05: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
Joshua Watson
b273056afb
VLab Issue #11629:NamDNG changes; fixes #11629
...
Change-Id: Iba3b15ba77612411e09f2f2a5dcb66461f08f31e
Former-commit-id: 2f78a8716f90ed6525455533d4b5a4d23f58a5f8
2016-02-25 09:41:07 -05:00
Ron Anderson
31ddc8e3da
Omaha #5411 Updates per latest mixed case guidelines
...
Change-Id: I6e578238e09da773489302895a7e7433d561455f
Former-commit-id: ea79be27628188bab964e3f6be31f96ceb008aca
2016-02-24 17:19:57 -06:00
Shawn.Hooper
f651a82d3b
Merge remote-tracking branch 'origin/master_16.2.1' into asm_16.2.1
...
Former-commit-id: e2d8494392a366995af0dbf7514780d0a98fc011
2016-02-24 16:17:01 -05:00
Ana Rivera
929a41677c
VLab Issue #15905 - DR17573 HLS and Hazard_TCV updates; fixes #15905
...
Change-Id: Idf4581dc82cb390377357438d25a6d6b94d2a2d7
Former-commit-id: d3b12a1226f4606ff225b71995bcb83927d7473d
2016-02-24 18:12:31 +00:00
Wen Kwock
86c6fe8830
VLab Issue #13176 - DCS18161 NBM version 2; fixes #13176
...
Change-Id: I80f9a22475e6847e41747a70de38535cb05ccff8
Former-commit-id: 15aecaf4625b83950d19d222062f0d63c249529d
2016-02-23 19:55:35 +00:00
Ana Rivera
9b97d8e4c3
Merge branch 'omaha_16.2.2' into field_16.2.2
...
Change-Id: Iaa9a1a801ee2059f5ffa5473a407ac8a7c1a4200
Former-commit-id: eb7beb890676babbbd203fc1721d48ceb067aba1
2016-02-22 20:35:27 +00:00
Steve Harris
4a865236eb
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Former-commit-id: 018f8407a70af07e72b6c1183dbc289bccd3b31c
2016-02-22 14:05:23 -06:00
Shawn.Hooper
663c44637f
Merge tag 'OB_16.1.2-20' into asm_16.2.1
...
16.1.2-20
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I9ed1c12896ffa710e7995f9682b4be1de88fa077
Former-commit-id: 9e3470f2b741592182dfae3e873503eb22df4f18
2016-02-22 11:13:16 -05:00
Penghai Wang
83ae2c8a76
Merge "VLab Issue #12796 - DCS 17815. Added Wave Steepness to Volume Browser; fixes #12796 " into asdt_16.2.2
...
Former-commit-id: 77d2fa7e7d6c0b58ec0cd0c29fef781c616a2386
2016-02-22 14:27:38 +00:00
Shawn.Hooper
d2c142b7bf
Merge branch 'master_16.2.2' into asm_16.2.2
...
Former-commit-id: 97a9c6a6ec0845c1ea823c0374365d3b0cd1bc14
2016-02-19 16:44:43 -05:00
Andrew Moore
e57b47dd4b
VLab Issue #12789 - Various Wave models should be in 3-hour timesteps instead of 6; fixes #12789
...
Change-Id: I9d34b391b1b5b4f6172cf62811ff7324e248044e
Former-commit-id: 678d895f59e622c821be5676135ad5219281d87d
2016-02-18 15:21:51 +00:00
Andrew Moore
6c8280d912
VLab Issue #12796 - DCS 17815. Added Wave Steepness to Volume Browser; fixes #12796
...
Change-Id: I50daa9a695fa3e074cc8cb5e9c8cdaea5b3334a4
VLab Issue #12796 - DCS 17815. Added Wave Swell to all *wave*xml files for Product Browser grid menu; fixes #12796
Change-Id: Iaafb3805fa9875f83fec819a9c0daea7a59a70a2
VLab Issue #12796 - DCS 17815. Added WSTP to all *wave*xml files for Product Browser grid menu; fixes #12796
Change-Id: Idd28282e2fc2cce689408fba6c03e3eecef0bdbf
Former-commit-id: 5fc1d36892051a57ef1e11605bdad24c136093df
2016-02-17 19:11:46 +00:00
Ana Rivera
6c892b970e
Merge branch 'master_16.1.2' into tcv_16.1.2
...
Change-Id: I4d87fbc00334e1c5261f0cee14ce5d1b788aee58
Former-commit-id: c2dbcab9941d6325a602cf99153ee6b39513cc3b
2016-02-17 13:16:48 +00:00
Shawn.Hooper
6070484233
Merge remote-tracking branch 'vlab/tcv_16.1.2' into master_16.1.2
...
Former-commit-id: 77fef70f5b79331f3c57cb580f0204acc1d9b64d
2016-02-16 11:10:37 -05:00
Steve Harris
4ba488bd0a
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Former-commit-id: 27f7e431d04f99ec48723c71413e9633c0d1996e
2016-02-15 10:15:20 -06:00
Sarah Pontius
4cd9308fa9
VLab Issue #15555 - HTI and Local TCV/HLS Revisions; fixes #15555
...
Change-Id: I5b8f8cd8dcedf3be427b81423bc9fc7bda794bc2
Former-commit-id: 5e055ffea9db10859d9217ebbf3a5f86999800b4
2016-02-12 14:47:40 -07:00
Ana Rivera
039658f5e7
Merge "VLab Issue #15553 - DR18623 nwpsTrkngCG0.py clean-up; fixes #15553 Remove references to 'local' and test comments in banner messages." into field_16.2.1
...
Former-commit-id: 59264a7f296e0d4c207003abc2bc0669ea6052ba
2016-02-12 12:32:46 +00:00
Tom Filiaggi
cdb44ff6f3
VLab Issue #15532 - GFE SmartInits ISC DB local parm - fixes #15532 .
...
This is a one-liner.
Change-Id: I5b3a83bde3bb9646dab2895bdbc3d2bf281d19e8
Former-commit-id: c187dedfc1e9b3d85bd1183e6bfdef5230c28782
2016-02-11 19:34:59 +00:00
Nathan Bowler
063c473391
Omaha #5283 Remove support for discontinued NGM data
...
Change-Id: I9c3fcf3bff03ed78cf77a8fdcd8b95da4d470dae
Former-commit-id: 0867569ae733dee3632e31bc216a06d356530e24
2016-02-11 12:20:32 -05:00
David Gillingham
a902b541b4
Omaha #5183 : Add GFE display support for raw data from PWPF model.
...
Change-Id: Id9d7e3e89f68184c4c0755506885806788c521b3
Former-commit-id: a034befa9aacad88b13e8dc3514de0c5cd28c9ea
2016-02-10 13:19:48 -06:00
Ana Rivera
3eab7cb811
VLab Issue #15553 - DR18623 nwpsTrkngCG0.py clean-up; fixes #15553
...
Remove references to 'local' and test comments in banner messages.
Change-Id: Ia5a886961d83f3c49dd952a8a362c9d9847b0722
Former-commit-id: f8e2338212a4ff8605d00824a76f4ac946181263
2016-02-10 14:54:52 +00:00
