Commit graph

11073 commits

Author SHA1 Message Date
Michael Gamazaychikov
f4448200b8 ASM #14803 - TextWS: WMO Header not being added to Record Event Report products.
Change-Id: I27d1bb8608230e69903c912a1b9c9be176eaf971

Former-commit-id: 8f9ac3376f2cc527660d17617177c600d8412ec9
2016-04-26 07:53:51 -04:00
Mark Ruebens
9a41ea8702 Merge "ASM #18893 - Hydro: Remove ip address from config file and change it to template." into asm_16.2.2
Former-commit-id: 05885826b241a423464ad00769de81ef659bf0d8
2016-04-22 06:54:09 -05:00
Shawn.Hooper
d1ea3fe5ce Merge tag 'OB_16.2.2-5' into asm_16.2.2
16.2.2-5


Former-commit-id: 091586984b60a78ac73985ddc73126b86b2edf50
2016-04-21 15:03:56 -04:00
steve.naples
73cc70b791 ASM #18893 - Hydro: Remove ip address from config file and change it to template.
Change-Id: I5a4c278d4510d4dd3d7aa01439b3646c7d8766a6

Former-commit-id: 76a0b8a049adc075b3f5d69acb59f93b80b0587a
2016-04-21 18:24:47 +00:00
Zhidong.Hao
7c7c63f749 ASM #18890 Java heap space parameter in cave.ini and wfo.ini files will not reflect changes made within memorySettings.xml
Change-Id: I41c5481434c54c89b8b0e1423d9569871142cd1a

Former-commit-id: 469146e92c5aff4f32d26b31850c69659cfe8149
2016-04-20 12:25:01 -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
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
dd23a4943f Merge remote-tracking branch 'asm/asm_16.2.2' into master_16.2.2
Former-commit-id: fecc682ec3f7f3f35800dfda8ca7eac4f8e757fc
2016-04-15 10:54:54 -04:00
Shawn.Hooper
20e3be0002 Merge tag 'OB_16.2.2-4' into asm_16.2.2
16.2.2-4


Former-commit-id: 448062b1c3739b760b1e815e10aba478f4898c92
2016-04-14 17:01:21 -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
Paul Tilles
89a9186994 Merge "VLab Issue #17691 - DCS 18497; fixes #17691" into ohd_16.2.2
Former-commit-id: 4ca9d765a07815f741f084514106c44de61c29f0
2016-04-13 15:00:40 +00: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
Nate Jensen
0e33d69a95 Merge "Omaha #5537 Update PWPF param names to include time period." into omaha_16.2.2
Former-commit-id: 6e117f539de5adf75e8577ab90cc5410dcc4203d
2016-04-12 14:02:08 -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
Shawn.Hooper
70993b8765 Merge remote-tracking branch 'vlab/asdt_16.2.2' into master_16.2.2
Former-commit-id: 8e06cc4b822348c4049cb1b011591d3083677ab2
2016-04-12 14:17:24 -04:00
Shawn.Hooper
b1874865f4 Merge remote-tracking branch 'asm/asm_16.2.2' into master_16.2.2
Former-commit-id: f256b76fee9dcb7d86de61c693f6aa180a9f16bf
2016-04-12 14:17:08 -04:00
Mark Peters
806cd7c3ab Omaha #4946 Fix localization delete action when prompt == false (for moving files)
Change-Id: I89ad497a727dc65fb3ef3c830c8ab681d23c3a3b

Former-commit-id: f60a607c78e1583aa3289412fb7923d963389a82
2016-04-12 13:13:43 -05: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
Zhidong.Hao
cc813328d8 ASM #18729 CAVE: Increase java heap space from 4096M to 6144M in cave.ini and wfo.ini files
Change-Id: I11188f3577967c143dac940fcabb4e19519fdfe0

Former-commit-id: 6450a3611911ec715439971292d25669bd57fda8
2016-04-11 16:43:57 -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
dbe96ef74d Merge remote-tracking branch 'vlab/field_16.2.1' into master_16.2.1
Former-commit-id: b4f7333cc860feead91470181015c0a9edfea97c
2016-04-11 13:52:48 -04: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
Ana Rivera
c4ffd03399 VLab Issue #17650 - Run_NWPS updates; fixes #17650
Change-Id: Ia6f793c6c11038ba74b5dd8655ba0ab64ff112b4

Former-commit-id: cea23eef8a09b6d6138878f71a18f9042ef8286d
2016-04-07 19:50:28 +00:00
steve.naples
7814a0b807 ASM #18350 MPE: DailyQC Temp stations will not display in Daily QC.
Change-Id: I6cd6d9cebdbcf7faddcfb03b7658142872eb9798

Former-commit-id: 7d73b1b6993473a17f8175516cedae2a847e003d
2016-04-07 19:27:15 +00: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
Ron Anderson
68250139fa Merge "Omaha #5559: Fix directory creation bug in ProductFileUtil.writeFile." into omaha_16.2.2
Former-commit-id: 9f044086b93b8020f923f7391c2dea534658a722
2016-04-07 13:04:42 -05:00
David Gillingham
81b98af568 Omaha #5559: Fix directory creation bug in ProductFileUtil.writeFile.
Change-Id: Ibd27d86423fd54c6b8f1cd0ab8a20a3a3d72160f

Former-commit-id: 9a1599b7746fd353e752b8fa120b1268b915ccdf
2016-04-07 12:20:32 -05:00
Tim Jensen
7312d01c79 Omaha #5281: Fix JMS validation if no prompt
Change-Id: Ia85576a8b5762e97fe672386127feefc3350299d

Former-commit-id: 2bb919189d313fe51da61aa9f6e8257af8bc1b0c
2016-04-06 17:07:15 -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
Daniel.Huffman
58b1c1d0ee ASM #11919 NIMNAT message should be on as default.
Change-Id: Ib72d3608d42dbb3ee466ac060436fc3cc75e4a02

Former-commit-id: ec5c9bf913b8809135300ed0a7202ff773498b0a
2016-04-06 20:06:54 +00: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
Shawn.Hooper
669abfa05b Merge tag 'OB_16.2.1-22' into asm_16.2.1
16.2.1-22


Former-commit-id: d8f666456d686df5b0159503fdca959130e31eab
2016-04-06 10:52:28 -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
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
Bryan Kowal
e728380be7 Omaha #5512 - no changes. apply AWIPS II code formatter.
Former-commit-id: 041f9bdcaaaae79875eae37fcc329a086a8c6a4d
2016-04-05 16:12:22 -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
Ron Anderson
cec8fbcb3b Omaha #5483 Fix Time Series displayed from right click of gage
Change-Id: I38ed17947c0b8dcee1db85eadaf6f2f3ae5ea069

Former-commit-id: 9f1818fdaa92141dcc7b5cb918427225f3014a51
2016-04-04 16:25:05 -05:00
Shawn.Hooper
0bc42475e7 Merge remote-tracking branch 'asm/asm_16.2.1' into master_16.2.1
Former-commit-id: 084fe2964431a0db70ab3c7a46a10a603fab8361
2016-04-04 14:43:27 -04:00