Brian.Dyke
c16617e7f7
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: c26e0cd548
[formerly e55b892fc3
[formerly 499b825592fdbdf150c918e5f3abacc4f37ddd70]]
Former-commit-id: e55b892fc3
Former-commit-id: 9ef7783251
2014-07-21 11:18:25 -04:00
David Friedman
59de9e6c91
ASM #15049 - LAPS time matching problem
...
Change-Id: I52eee87defb407b741208e183b9829558bfa6733
Former-commit-id: 188e25d2e7
[formerly ec25c44fe7
[formerly 624c3a4225910863d5cc0b795493a39c0422a3e3]]
Former-commit-id: ec25c44fe7
Former-commit-id: 6aebd3a19b
2014-07-18 17:06:05 +00:00
Nate Jensen
9aa3ba110f
Issue #2954 actually log when the scalesInfo.xml cannot be parsed before
...
falling back to the base version
Change-Id: I2df669504061160c6ace76560f07845f99a80912
Former-commit-id: 2a01b1ebcd
[formerly da731be2f7
[formerly 894e6ac1db5b34e6466c68aefa5877b9405bfd59]]
Former-commit-id: da731be2f7
Former-commit-id: 82bef00378
2014-07-17 13:27:48 -05:00
Nate Jensen
ef72e8e222
Issue #2954 fall back to existing map scales if map scale is missing
...
Change-Id: I75083325edec689c38f2fe7661c635ddf3e0f527
Former-commit-id: ed9bee5533
[formerly 6e21526fd2
[formerly c7167ad2f59ba02edc842f321d12cd36cd6da8bb]]
Former-commit-id: 6e21526fd2
Former-commit-id: c07802a208
2014-07-15 18:27:09 -05:00
Fay.Liang
e571f735bb
ASM #15468 Shefdecode failed to ingest RVF product at OUN
...
Change-Id: I6238c25f867c0e6e491831e9c2b1c47e22484620
Former-commit-id: a00be8447d
[formerly 87d50e7296
[formerly 3637d6387396f88811ec3964bd61d10ce0ee38eb]]
Former-commit-id: 87d50e7296
Former-commit-id: 7cbd90018e
2014-07-15 10:22:09 -04:00
Nate Jensen
c0d1fe1bd8
Issue #3372 make LocalizationStreamHandler thread safe
...
Change-Id: I208b66fbd2b0bfcd225c3df98f96bcdcf5cb9a88
Former-commit-id: aaa0ed7ed7
[formerly 47bf21d7b5
[formerly 87d5faa03ea63759a6805ed063174fb09ca4800a]]
Former-commit-id: 47bf21d7b5
Former-commit-id: 801ed7154f
2014-07-14 09:18:16 -05:00
Fay.Liang
a6b6b401f2
ASM #15468 Shefdecode failed to ingest RVF product at OUN
...
Change-Id: Ie345c88c4a3a0ff995c4d33772f90e863bed7ee5
Former-commit-id: 65677246c2
[formerly 400561ac9c
[formerly f78783d2ea194539414294abff46d4f2acda65d1]]
Former-commit-id: 400561ac9c
Former-commit-id: 34465f09ce
2014-07-11 15:19:08 -04:00
Juliya Dynina
da9c6c35d2
Merge "ASM #15557 - Restore ability to display HPCGuide2.5" into asm_14.2.2
...
Former-commit-id: 8d967f1ecf
[formerly ac39f9cb43
[formerly 9826716e2a5f59826e8a3789ca8d2d8f8dc58cce]]
Former-commit-id: ac39f9cb43
Former-commit-id: b9cd9042dd
2014-07-11 08:37:30 -05:00
Mike Duff
c5a344ac75
Issue #3370 - Revert "Issue #3370 - Fix for mulitple shef types in same file."
...
This reverts commit 6ce3e57525
[formerly e3b7a99388
] [formerly b5b61650d3
] [formerly 30655cf2ca
[formerly b5b61650d3
[formerly 0c0b14929f74f2262559a4919171623870139313]]].
Former-commit-id: 73c75303a8
[formerly a35529bba4
[formerly 43cbf77bb90ba12a6ee11bc35b18c226f9490a88]]
Former-commit-id: a35529bba4
Former-commit-id: c8bfcd54a3
2014-07-10 16:01:56 -05:00
Melissa Porricel
73063fd894
ASM #15557 - Restore ability to display HPCGuide2.5
...
Change-Id: Ibdcdd0aa95e406b5cd886dc8f51e74a3cde54d17
Change-Id: I5594c2151026247d48e657a30c7b4f94b14f036f
Former-commit-id: 1f7cf4a165
[formerly d3c29b834d
[formerly 5998e7ad9690e3b87805c75dcb711d299e8f1427]]
Former-commit-id: d3c29b834d
Former-commit-id: 1e5bef6820
2014-07-10 16:15:12 -04:00
Mike Duff
6ce3e57525
Issue #3370 - Fix for mulitple shef types in same file.
...
Change-Id: I23110d7887b68ff073afdf61815d7dced9c4a3ad
Former-commit-id: 30655cf2ca
[formerly b5b61650d3
[formerly 0c0b14929f74f2262559a4919171623870139313]]
Former-commit-id: b5b61650d3
Former-commit-id: e3b7a99388
2014-07-10 10:05:05 -05:00
steve.naples
72ae26401d
ASM #253 Update RadarBiasTableDialog fix issue of not saving undo.
...
Change-Id: I57ad9d4407665fd4c5f7e922cbf3daac373c9f88
Former-commit-id: 0bd7b6c65b
[formerly 339fcbc18a
[formerly 24b9a6e0801cc653062a71d86090df3836aa86a4]]
Former-commit-id: 339fcbc18a
Former-commit-id: 2ebfd61f12
2014-07-09 15:42:51 +00:00
Ron Anderson
10f629428e
Issue #3332 Fixed race condition which could cause GFE grid saving to hang
...
Change-Id: I4a2ef9e25999d95ac1ecf204907c59b2f1e85652
Former-commit-id: 5efba03474
[formerly 111b04296c
[formerly b01b72b896b894568acce6a8dc4d45328a06067a]]
Former-commit-id: 111b04296c
Former-commit-id: 4b4629a2fd
2014-07-09 08:56:06 -05:00
steve.naples
9dcf27e217
ASM #253 Update RadarBiasTableDialog fix issue of not saving.
...
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673
Former-commit-id: 24b0d49a5b
[formerly 75969ceec2
[formerly 9021eca6b32dd2b3859cd928c14a0e40a4907c13]]
Former-commit-id: 75969ceec2
Former-commit-id: 29ca2338b8
2014-07-08 16:32:08 +00:00
Brian.Dyke
6ea9a4cc23
Merge branch 'asm_14.2.2' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: 89c0457b1d
[formerly 2ef4767652
[formerly 845aebda9d8af143e3a6828c066b291e0343a020]]
Former-commit-id: 2ef4767652
Former-commit-id: a33fdeb558
2014-07-07 13:33:35 -04:00
David Friedman
b82fb691e0
ASM #15052 - WarnGen: service backup should use config.xml from failed site
...
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: db8977e281
[formerly a45fe1dad0
[formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]]
Former-commit-id: a45fe1dad0
Former-commit-id: 8784501bba
2014-07-03 13:58:24 +00:00
Juliya Dynina
3cb8068313
Merge "ASM #253 Update RadarBiasTableDialog to remove old code." into asm_14.2.2
...
Former-commit-id: 470d50b4e4
[formerly 244b2f5f3a
[formerly d6ae0d12f104de38b8fa770e4576b96a32da360c]]
Former-commit-id: 244b2f5f3a
Former-commit-id: 67580e73cd
2014-07-02 14:17:11 -05:00
Steve Harris
eaa91efeec
Merge branch 'master_14.2.2' (14.2.2-17,18) into omaha_14.2.2
...
Former-commit-id: 0ef8a057f9
[formerly 136af3f7e2
[formerly c88d3136dbadab41df5fbf37b4b7c821dfcd07d9]]
Former-commit-id: 136af3f7e2
Former-commit-id: 9b7f820b06
2014-07-02 13:38:08 -05:00
Brian.Dyke
e68dd70904
Merge branch 'm1413_m1422_merge' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2 CM-MERGE:14.1.3-4 into 14.2.2
...
Former-commit-id: 658cf3dd56
[formerly d56843d0e8
[formerly 142e61e538fb094633933e5a2e1244441fc0106b]]
Former-commit-id: d56843d0e8
Former-commit-id: 0fc76ff807
2014-07-02 13:18:10 -04:00
steve.naples
e82b0ae895
ASM #253 Update RadarBiasTableDialog to remove old code.
...
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f
Former-commit-id: 4e959af1b4
[formerly 66c3241bc4
[formerly b9f868e0ced53987accf675bfe2ce1a1f4f34da1]]
Former-commit-id: 66c3241bc4
Former-commit-id: 3d75da3db0
2014-07-02 15:30:48 +00:00
Nate Jensen
2baedbf6b8
Issue #3337 disable logback packaging data in cave
...
Former-commit-id: 939fde1575
[formerly c003d70168
[formerly db10ba5a37dbe219110f4f902bf9257f2f220b3d]]
Former-commit-id: c003d70168
Former-commit-id: 56363ffc4a
2014-07-02 09:24:15 -05:00
Steve Harris
070e025fb4
Merge branch 'master_14.1.3' into master_14.2.2
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: fcecd75dfd
[formerly 483a69c58d
[formerly f947df2bf87c0df3e461be5c6dd72e13a0743f61]]
Former-commit-id: 483a69c58d
Former-commit-id: 4882158177
2014-07-01 18:05:43 -05:00
Brian.Dyke
505d2d7938
Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: f8759e2317
[formerly 3ed9e07c44
[formerly 625eefb5f53e292d947233c1cd0aa031e61ca9ea]]
Former-commit-id: 3ed9e07c44
Former-commit-id: 7b205d97ca
2014-07-01 15:41:10 -04:00
Ron Anderson
319819d3a7
Omaha #3296 A few more minor performance tweaks and some addtional logging.
...
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)
Former-commit-id: 4123073c4e
[formerly 2c5f910f90
[formerly a0384ccfb30a877f14893c6cfa62d92117c0bb87]]
Former-commit-id: 2c5f910f90
Former-commit-id: c7a74ab5b1
2014-07-01 13:56:41 -04:00
Ron Anderson
1f056e7ab9
Omaha #3296 Added performance logging. Moved backup and purging to separate java thread. Cached PythonScript.
...
Change-Id: I9814345b512674269f17f4bf61bd615f0a50b059
(cherry picked from commit a11bcadd76eb9f9597e23ee609fd9cb364ad26ac)
Former-commit-id: 487c7ee30a
[formerly beee08c32b
[formerly 49638ba1e9561dea7b318b7adc0f1ab9571170f5]]
Former-commit-id: beee08c32b
Former-commit-id: 9818d9b485
2014-07-01 13:56:05 -04:00
Juliya Dynina
9fc999e435
Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
...
Former-commit-id: 102da2d0f7
[formerly b5e4bc1fdc
[formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]]
Former-commit-id: b5e4bc1fdc
Former-commit-id: bf765525b7
2014-07-01 10:05:57 -05:00
Juliya Dynina
0959178a06
Merge "ASM #660 - WarnGen can generate polygons that do not match hatched area" into asm_14.2.2
...
Former-commit-id: 3aeceabb7a
[formerly 0fe04515ad
[formerly 2260a05df61ec1dc21cc6619fcb48713368e3a46]]
Former-commit-id: 0fe04515ad
Former-commit-id: 3ee22b685d
2014-07-01 09:01:55 -05:00
Sean.Webb
4aa35df7c7
ASM #552 - Increased postgres max_connections to 400
...
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03
Former-commit-id: 0b29e66772
[formerly c24c2f1e3e
[formerly add5d004eca457782f957a95262e880b91dfeeb1]]
Former-commit-id: c24c2f1e3e
Former-commit-id: 5288764393
2014-06-30 16:06:25 -04:00
Qinglu.Lin
660d1c9ff2
ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
...
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81
Former-commit-id: 1d52d020eb
[formerly 1200633cd2
[formerly 4d50beaed59d785d923e357f8ce036f6625ce4b4]]
Former-commit-id: 1200633cd2
Former-commit-id: 1180b31875
2014-06-30 13:09:15 -04:00
David Friedman
5c62d368ea
ASM #660 - WarnGen can generate polygons that do not match hatched area
...
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652
Former-commit-id: dc25040a25
[formerly 18b3b61afc
[formerly 993663cbee3f794981fc7f4cc97f96e3b86c47f8]]
Former-commit-id: 18b3b61afc
Former-commit-id: c4967a96fb
2014-06-27 19:17:55 +00:00
Mike Duff
0de6d3b92a
Issue #3321 - Fix ingest switch checks
...
Change-Id: I7de7ee482ab57789874a179499e6c51079e68e12
Former-commit-id: d62c925baa
[formerly f17c93bb19
[formerly 5df0ac7f96d1280c1c50f39982693f9503b56f14]]
Former-commit-id: f17c93bb19
Former-commit-id: 1d3aeb881b
2014-06-26 16:23:02 -05:00
Brian.Dyke
5b88408af1
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: 3df14b5a94
[formerly a5ae302690
[formerly 632577244e843dd122c00b745e973730c7920246]]
Former-commit-id: a5ae302690
Former-commit-id: a48268a1d6
2014-06-26 10:39:49 -04:00
Ron Anderson
8c0311507b
Issue #3317 Fix merge problem that removed GFE notification of D2D purge
...
Change-Id: I925b7287bdb2fb7f9c330b05b1b2c32031e693d9
Former-commit-id: a6956a8ccd
[formerly ead09dd683
[formerly 04805a8957ef14754225f85f4722d8302cde8df3]]
Former-commit-id: ead09dd683
Former-commit-id: 5dd7a035ac
2014-06-25 19:12:51 +00:00
Ron Anderson
cdef6bd26c
Issue #3317 Fix issue with obsolete D2DGridDatabases not getting purged.
...
Change-Id: If792327215bb9f8db470c95099463e735c462d46
Former-commit-id: 2ac9cd84ec
[formerly 898b30fadb
[formerly 2a84ea1af7bb767e9e85387de1fd90c662f9f91d]]
Former-commit-id: 898b30fadb
Former-commit-id: f76a2d3700
2014-06-25 13:21:32 -05:00
Steve Harris
7f040f069c
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
...
Former-commit-id: ddc6f2092a
[formerly 89606076ec
[formerly 174fe6d66525229f328846a1f4564300d7603c10]]
Former-commit-id: 89606076ec
Former-commit-id: 3f2058a1ab
2014-06-24 10:57:56 -05:00
steve.naples
e994aa9482
ASM #253 Update RadarBiasTableDialog to allow undo changes.
...
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9
Former-commit-id: 90ed511478
[formerly efe877d82b
[formerly fcd20d35abf3617701cc797baf9ba2b3984379c8]]
Former-commit-id: efe877d82b
Former-commit-id: 2a49bbda2f
2014-06-24 15:52:23 +00:00
Nate Jensen
ef9e4c2439
Issue #3248 ensure that a locking file output streams obtains the lock
...
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit e39ecf5473
[formerly 4558fe5862
] [formerly 845483346f
] [formerly 65eb76ff66
[formerly 845483346f
[formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]])
Former-commit-id: 65619399a0
[formerly ca27873204
[formerly f0ad63d2ccf347e92274701f9890e120b9e70140]]
Former-commit-id: a160f9e2840f0ab223e8e22743c49a053da45545 [formerly ca27873204
]
Former-commit-id: 333f8317bb
2014-06-23 11:59:26 -05:00
Nate Jensen
cfd3efcfe2
Issue #3307 fix xml serialization of looping field
...
Former-commit-id: 97ef9fc343
[formerly 51da67dd3f
[formerly c6ce72840a4ee0f44eacff46015b5382d86dd47f]]
Former-commit-id: 51da67dd3f
Former-commit-id: c7c0d9cb4b
2014-06-23 09:54:11 -05:00
Steve Harris
869235c02a
CM-MERGE:14.1.3-2,-3 into 14.2.2
...
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 419c5f4aba
[formerly b84dda5930
[formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]
Former-commit-id: b84dda5930
Former-commit-id: 16f5ff0979
2014-06-20 14:01:55 -04:00
Brian.Dyke
e3dc97e246
CM-MERGE:OB13.5.6-4 into 14.1.3
...
Former-commit-id: 8ecdd9a192
[formerly 399c06820a
[formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]
Former-commit-id: 399c06820a
Former-commit-id: be589ceb9b
2014-06-18 08:55:49 -04:00
Brian.Dyke
232d538288
CM-MERGE:OB13.5.6-3 into 14.1.3
...
Merge branch 'master_14.1.3_merge' into master_14.1.3
Former-commit-id: 482f915b42
[formerly 30d8644fa5
[formerly 4b317062ce5c35823210cbbf023c0f0fc8051ef3]]
Former-commit-id: 30d8644fa5
Former-commit-id: 06c565d74f
2014-06-13 14:05:49 -04:00
Brian.Dyke
4766b3f49f
CM-MERGE:OB13.5.6-3 into 14.1.3
...
Former-commit-id: 81832d97e5
[formerly 346bf852cd
[formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]
Former-commit-id: 346bf852cd
Former-commit-id: 5064d24e26
2014-06-13 13:21:19 -04:00
Steve Harris
61cb3f45b4
Merge branch 'master_14.2.2' (14.2.2-13) into omaha_14.2.2
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: If5dae78936eddf1bc4ee63f35beb96a0cb9defb9
Former-commit-id: 9510608b74
[formerly ad6e9fa5ee
[formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]]
Former-commit-id: ad6e9fa5ee
Former-commit-id: 3a3277c469
2014-06-11 12:55:44 -05:00
David Friedman
350566a514
ASM #604 - Lightning display varies depending how long CAVE has been open
...
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: 1c84c31e30
[formerly b8542c1332
[formerly a3f4fd6537f3847011e199e0f043968d9f595937]]
Former-commit-id: b8542c1332
Former-commit-id: 6d0d3f5ba5
2014-06-11 13:37:16 +00:00
Brian.Dyke
7056d79f70
Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 9ab17ddecb
[formerly f72380ad60
[formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]
Former-commit-id: f72380ad60
Former-commit-id: 0f07e14bf1
2014-06-10 13:56:03 -04:00
Brian.Dyke
64a10ce12d
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
...
Former-commit-id: 8874d41872
[formerly c1b3f9d180
[formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]
Former-commit-id: c1b3f9d180
Former-commit-id: ef5c74dece
2014-06-10 12:52:59 -04:00
Steve Harris
483d61f414
Merge branch 'master_14.2.2' (14.2.2-12) into omaha_14.2.2
...
Former-commit-id: bd98f04cde
[formerly 14370245fd
[formerly 65793ec4d12626b2d3365c5a0e8c3e229972b289]]
Former-commit-id: 14370245fd
Former-commit-id: 6e09bce335
2014-06-09 15:20:03 -05:00
Mike Duff
b2162559fe
ASM #605 - Cherry-pick Omaha Issue #2954 from 14.3.1 into 14.2.2 to fix CAVE not starting if scale bundle is missing.
...
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1
Former-commit-id: 39173c380c
[formerly 81ab64d7ff
[formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]]
Former-commit-id: 81ab64d7ff
Former-commit-id: b876d9755a
2014-06-06 16:03:14 -04:00
Xuezhi.Wei
ba05b6f16a
ASM #579 - shef-ingest.xml updates for performance tracking
...
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2
Former-commit-id: 33b235a0a4
[formerly bdbeec662c
[formerly f7b5f3bbc71cc251e19f1764ee7756050895b7a3]]
Former-commit-id: bdbeec662c
Former-commit-id: 81ec03e291
2014-06-06 17:40:09 +00:00
Juliya Dynina
1b61a32634
Merge "ASM #114 - Problem with Distance Speed Tool." into asm_14.2.2
...
Former-commit-id: 87216a87de
[formerly 80a83bd44c
[formerly 1e1c7cbcee94e782338d440d585a3217ad606725]]
Former-commit-id: 80a83bd44c
Former-commit-id: 21cd415434
2014-06-06 09:50:36 -05:00