Commit graph

3675 commits

Author SHA1 Message Date
Rici.Yu
d57ef4bca2 ASM #16942 - GFE: VTEC Active Tables not getting purged
Change-Id: Ib71d667d8f59ab1fa3c669653d2bc8636bd7901c

Former-commit-id: 14bb4d4d59 [formerly 48dcae9064 [formerly 6fbdb136e3968e197c38907a20ba898d9532e39e]]
Former-commit-id: 48dcae9064
Former-commit-id: 8a5e418304
2015-02-05 15:22:49 -05:00
David Friedman
89bc130203 ASM #17066 - afoslookup entry for site KEY is missing
Change-Id: I8f2ac59c416a2a9f5f28fb72993c5947fb96c126

Former-commit-id: c1aec126c1 [formerly de9a5fd3b3 [formerly 49c3a36159f66eb35b70bb76f210b36b2c7140f9]]
Former-commit-id: de9a5fd3b3
Former-commit-id: 7912200761
2015-02-05 16:21:48 +00:00
Shawn.Hooper
a125ba732a ASM #17100 - Revert "VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563"
This reverts commit 52f4873f3f [formerly cbc7d2813f] [formerly bf5bb1bacf] [formerly bfc550b378 [formerly bf5bb1bacf [formerly 5189ae1c3ce12320045c431d9552036ea9272cef]]].

Change-Id: Ie8d46f14aab90286a5562e6b79cd7dfabceb33c0

Former-commit-id: fa9e3791cb [formerly 0ac88acf05 [formerly 0ed82706fda1158292e6f789cceea378f5879e37]]
Former-commit-id: 0ac88acf05
Former-commit-id: 9c9bb841ca
2015-02-05 10:30:29 -05:00
Ana Rivera
3610f8304b Merge branch 'master_14.4.1' into field_14.4.1
Change-Id: Iadb5e401012d3f34ebd1332cfa872c91270d2c72

Former-commit-id: be625ca07e [formerly 2d5a46ab0c [formerly 2a505d2ebd87b1a2e8f05f6d304debf48be9971c]]
Former-commit-id: 2d5a46ab0c
Former-commit-id: e36429dcbd
2015-02-05 14:17:31 +00:00
Mike Duff
733fd3d2b7 Issue #4030 - Added check for blank lines
Former-commit-id: b9557d58b8 [formerly bd16f5b1d1 [formerly 7252df4112903132ae0c1bbe36bdc66add219ae5]]
Former-commit-id: bd16f5b1d1
Former-commit-id: 9e6dbcb03d
2015-02-04 16:59:37 -06:00
Fay.Liang
9d58b11efd Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 649426f4b3 [formerly 551e3dfac0 [formerly 999467410f61f1874d5cf1e599fca9ce83ae4f70]]
Former-commit-id: 551e3dfac0
Former-commit-id: 81ebcaada8
2015-02-04 16:51:19 -05:00
Shawn.Hooper
227b629a0b ASM #15311 - Update pgadmin spec file to allow for postgresql version greater than or equal to 8.4.13-1 and customTargets.xml for EDEX to allow for flexible feature files.
Change-Id: I9cf47aff9c6fa874ffe3d2e8bbbba2871abacec2

Former-commit-id: 915ddd6964 [formerly a98b54a944 [formerly f1383bbdbadc54f8f2a0384d319c70160464a3ac]]
Former-commit-id: a98b54a944
Former-commit-id: f4cd41e2f6
2015-02-04 16:47:26 -05:00
Fay.Liang
5ed008279f Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 98fc313530 [formerly fa2ec69693 [formerly 85751935d73a6c64fd041c791ddb09f081831e20]]
Former-commit-id: fa2ec69693
Former-commit-id: 091ebb1da5
2015-02-04 16:20:31 -05:00
David Friedman
fb304398b0 ASM #17009 - Add Guam to countyTypes.txt file to account for "no counties"
Change-Id: Ic8dc2519b1cfb35bf3a2e0d8d61c007e108429a8

Former-commit-id: d1b3f2a5f4 [formerly beb5074ddd [formerly 61ee73806f184b0d4092b8474f18b3525d92a20b]]
Former-commit-id: beb5074ddd
Former-commit-id: 8a31830def
2015-02-04 19:56:47 +00:00
Steve Harris
dfa3bb1060 Merge tag 'OB_14.4.1-7m' into omaha_14.4.1
14.4.1-7


Former-commit-id: 2468be4dd1 [formerly f428e16ebb [formerly 88b43275725882327d4487733e3135489874de1f]]
Former-commit-id: f428e16ebb
Former-commit-id: 8f2af8e359
2015-02-03 17:18:57 -06:00
Steve Harris
c693e7c283 Merge branch 'master_14.3.1' (14.3.1-48) into omaha_14.3.1
Former-commit-id: 7302d69de3 [formerly 1cffbb7cab [formerly dc9c30b433bb04e88eb34108069ac5d5c4915e40]]
Former-commit-id: 1cffbb7cab
Former-commit-id: c3bb810eb1
2015-02-03 17:16:23 -06:00
Joshua Watson
2ea15c4b05 VLab Issue #5238 - changed parmsGFSLAMPGrid to GFSLAMPGridPARMS. Changed serverConfig.Vis to Vis on that same line; fixes #5238
Change-Id: I1724074899bad140a60c7f4da37622178ddba3c0

Former-commit-id: 4c574676d7 [formerly af60ca1232 [formerly b32bdbe92d1db52997c9e79ece82df19f91357f3]]
Former-commit-id: af60ca1232
Former-commit-id: 931a18418d
2015-02-03 17:43:17 -05:00
Fay.Liang
1adbe5f79d Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: de502a310b [formerly 07c742044d [formerly 8f839ec64da04492e6cf109fdf47b95f08db5388]]
Former-commit-id: 07c742044d
Former-commit-id: 3aa9f17455
2015-02-03 16:04:56 -05:00
Roger Ferrel
8d2ce7a0d4 Issue #4066 Added Earth Networks Total Lightning to pqact.template and RAW_DATA.xml
Change-Id: I09ccfea7e02134339771550fb915bb3516067320

Former-commit-id: 6e4b93ed15 [formerly ba9e38efb2 [formerly 4d9df40733b0ac8cfa40974dd13abe2e204ab3bd]]
Former-commit-id: ba9e38efb2
Former-commit-id: 7be8540aec
2015-02-03 11:58:13 -06:00
Steve Harris
d0a1514ece Merge tag 'OB_14.4.1-6m' into omaha_14.4.1
14.4.1-6


Former-commit-id: b684848820 [formerly db185ed16c [formerly 6873606777f0c7c18928b0b0814050742c256dc2]]
Former-commit-id: db185ed16c
Former-commit-id: 80dae4bc15
2015-02-03 11:24:39 -06:00
Fay.Liang
eafbc466a4 Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: f1c34884a5 [formerly ae85ade54d [formerly 06a34c609a217ca98b027ac6d92a31faf802b668]]
Former-commit-id: ae85ade54d
Former-commit-id: 5550322f62
2015-02-03 11:24:57 -05:00
Richard Peter
d48f07ebeb Merge "Omaha #4031 Implement preferrred AFOS first letter." into omaha_14.4.1
Former-commit-id: a3a4c9b0b7 [formerly 166bf912bd [formerly 28d8103fc3287f27edccc6187ca3df5d72726d97]]
Former-commit-id: 166bf912bd
Former-commit-id: a63c9099c8
2015-02-02 12:49:01 -06:00
Richard Peter
57b202d081 Merge "Issue #4030 - Added functionality to convert NDM menu files to A2 menu files and have them droped into the NDM endpoint." into omaha_14.3.1
Former-commit-id: 754a99cd97 [formerly 046af0d200 [formerly fc43e146c7497c04a698bc745ba3685429486863]]
Former-commit-id: 046af0d200
Former-commit-id: 40b8dd0dad
2015-02-02 12:25:56 -06:00
Mike Duff
6582adfe02 Issue #4030 - Added functionality to convert NDM menu files to A2 menu
files and have them droped into the NDM endpoint.

Change-Id: Ieb87acafed0d9e756be49c3111ba97a921ca425e

Former-commit-id: 8f2350f660 [formerly 71cc843faa [formerly 3f5edb033f8b54908adcd3a751eabe189570d338]]
Former-commit-id: 71cc843faa
Former-commit-id: e55804c0b4
2015-02-02 12:06:05 -06:00
Fay.Liang
a601a2c9f7 Merge branch 'master_14.3.1' into master_14.3.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/doConfig.py

Former-commit-id: 15f28c0245 [formerly 4ddd4cec81 [formerly 307e986b8e9ce89ad1eb7b28f88afe82c2596f30]]
Former-commit-id: 4ddd4cec81
Former-commit-id: 99b1511120
2015-02-02 10:06:58 -05:00
Ying-Lian.Shi
9a3b6dab41 ASM #17081 Service Backup - add vtec
Change-Id: Id2e4d8024699c3a95c1c945919fc757b72d3d1aa

Former-commit-id: 55674f46fa [formerly bf2d61894f [formerly 82e8c3ce886e0be2cf1044c87ba0e2cf004c1afe]]
Former-commit-id: bf2d61894f
Former-commit-id: c2798efc95
2015-01-30 23:01:23 +00:00
Matthew Howard
6298cbc912 Merge "ASM #17055 - fix activeTableChange logging" into asm_14.4.1
Former-commit-id: 5bdaf8cd94 [formerly a1c925be94 [formerly e14672d6e2b075792600c4d4d709044049e21d04]]
Former-commit-id: a1c925be94
Former-commit-id: 9c2ab1517f
2015-01-30 14:29:49 -05:00
Ana Rivera
2be03903bc Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5

Former-commit-id: 070f0136ec [formerly ea92049aac [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]
Former-commit-id: ea92049aac
Former-commit-id: ccd0a40621
2015-01-30 19:29:29 +00:00
Roger Ferrel
fa46ebe8a7 Omaha #4031 Implement preferrred AFOS first letter.
Change-Id: I1c011beaf078d08c79c02863ac8afd01c7318645

Former-commit-id: 61ab864445 [formerly 28f435a27f [formerly 776989760fa936913006924efb1e84832ffec31f]]
Former-commit-id: 28f435a27f
Former-commit-id: fca30b70f5
2015-01-30 13:01:01 -06:00
Rici.Yu
15e5ddee15 ASM #17055 - fix activeTableChange logging
Change-Id: I863a43005685b5b73eb96d80f0ffa46d12ecfcbc

Former-commit-id: e9349a6701 [formerly 969e5ca72b [formerly 777729392f9cdbbcfe3bbdd7ac4c19c714dfb31a]]
Former-commit-id: 969e5ca72b
Former-commit-id: 2fd2028490
2015-01-30 13:19:40 -05:00
Zhidong.Hao
d8d346a80d ASM #647 GFE: Files not getting purged out of /awips2/GFESuite/products/ISC
Change-Id: I64fe04fb736e9dae2158d0dc1401af5795d2ddeb

Former-commit-id: 6ab746f74a [formerly caa2ebde5e [formerly 86cf0fa14af93c1bf35f57e566e19ad45fb34b34]]
Former-commit-id: caa2ebde5e
Former-commit-id: 60fbbed390
2015-01-30 11:31:36 -05:00
Slav Korolev
e44794e98b Omaha #3220 - Performance - Safe Seas, Snow, Fog.
Former-commit-id: 9e076f7970 [formerly 2bb8bc22a6 [formerly f8ee84a324b3653a75aa3c63a793eca412e1bd81]]
Former-commit-id: 2bb8bc22a6
Former-commit-id: efee22d0fb
2015-01-29 14:50:02 -05:00
Fay.Liang
2bd6d69680 Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: e8b40ad087 [formerly 8aa0a2a200 [formerly 8c72e62260026a2d1d2fb41839f1e79535b09b7f]]
Former-commit-id: 8aa0a2a200
Former-commit-id: 4c69a4bc24
2015-01-28 14:31:02 -05:00
Steve Harris
94c54c32b1 Merge tag 'OB_14.4.1-5m' into omaha_14.4.1
14.4.1-5


Former-commit-id: bc3f196d48 [formerly 9927bac8ed [formerly 6f10c0ebeb8956fd0d12f424ddd9b09bdc4b4021]]
Former-commit-id: 9927bac8ed
Former-commit-id: 1cce5ed9ef
2015-01-28 12:57:55 -06:00
Ana Rivera
ed61c52ee3 Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40

Former-commit-id: 20ad0a65f3 [formerly 8bfa7c4087 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]]
Former-commit-id: 8bfa7c4087
Former-commit-id: 4071b58b85
2015-01-27 22:05:59 +00:00
Steve Harris
70b40e76fb Merge branch 'master_14.4.1' (14.4.1-4) into omaha_14.4.1
Former-commit-id: 82f2a146da [formerly 1891ed5e5b [formerly cfd0a31a17fc4a92af6db3f034d46b01996d2cc0]]
Former-commit-id: 1891ed5e5b
Former-commit-id: 0ac687b980
2015-01-27 11:34:06 -06:00
Fay.Liang
745ddd63c0 Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 7bc10075e5 [formerly d29d86ad05 [formerly 6ad30059fa7249aba100a39c7c39215212a929cc]]
Former-commit-id: d29d86ad05
Former-commit-id: 65d91d9113
2015-01-27 12:08:28 -05:00
Ana Rivera
dd232580d0 Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18

Former-commit-id: 327945af8b [formerly 7c5fc26537 [formerly 889608360567b829f81ed6392c64c669798f34a9]]
Former-commit-id: 7c5fc26537
Former-commit-id: 62094315d2
2015-01-27 16:28:42 +00:00
Shawn.Hooper
28a4627f0c ASM #17071 - Add tokens for Alert Alarm System
Change-Id: Idec6bd4aabe6d317c1cc168113a346567d30b189

Former-commit-id: 8757585386 [formerly 9ca10f111a [formerly 2bba487d259e87c20e43a8e10573392dca011206]]
Former-commit-id: 9ca10f111a
Former-commit-id: 0a91e7cf47
2015-01-27 11:22:56 -05:00
Ron Anderson
f6c2df4507 Merge "Omaha #4033 Fix logging in configureTextProducts" into omaha_14.4.1
Former-commit-id: 3a804c4be7 [formerly d97b54018c [formerly aa7900e79f0ce9074c32ad0785dd9d0ccbfa64ba]]
Former-commit-id: d97b54018c
Former-commit-id: 178ad50f20
2015-01-27 08:59:12 -06:00
Ron Anderson
24c51738d6 Omaha #4033 Fix logging in configureTextProducts
Change-Id: I1d2de04b532a3d543418d42c76e499cde2c04030

Former-commit-id: 29930e52b3 [formerly 13bfa6e362 [formerly 1c1fefe7cc5cf26abf7c60254132ddeb22585b26]]
Former-commit-id: 13bfa6e362
Former-commit-id: 0dc17a57a2
2015-01-26 17:50:28 -06:00
Ana Rivera
48cb3fd143 Merge branch 'master_14.4.1' into emc_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1

Former-commit-id: 7c25945fd9 [formerly 98ac97e397 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]]
Former-commit-id: 98ac97e397
Former-commit-id: 654d08a588
2015-01-26 18:45:26 +00:00
Shawn.Hooper
ee48ce9e68 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: e84a037b2e [formerly 568b7c801a [formerly 95cdc2d817eac840017fc14746c2ada498f1a716]]
Former-commit-id: 568b7c801a
Former-commit-id: e6c4f29036
2015-01-26 11:22:49 -05:00
Nate Jensen
6de7f4d2c8 Omaha #3952 remove custom gzip handling since it is by default enabled
by apache httpclient

Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802

Former-commit-id: c4598baf19 [formerly 63189329a1 [formerly 4f67ebeb092d182ec0a4e5078e668313d8cc6a57]]
Former-commit-id: 63189329a1
Former-commit-id: 7e8d355f62
2015-01-26 09:10:36 -06:00
Steve Harris
ea3465f55a Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
Conflicts:
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec

Former-commit-id: 0f05c53a53 [formerly 158fa16376 [formerly 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79]]
Former-commit-id: 158fa16376
Former-commit-id: 8cd9e2e92f
2015-01-23 09:08:06 -06:00
Daniel.Huffman
6fb4fb0a86 ASM #17057 RadarDecoder::AlertMessageSanityCheck
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c

Former-commit-id: a25fa81a0f [formerly 845998cbfa [formerly 498f55c757f20f70b11a921a2e5948c3c7c49c90]]
Former-commit-id: 845998cbfa
Former-commit-id: f4ac238888
2015-01-22 21:13:04 +00:00
Shawn.Hooper
eefaa49d44 Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: a757b55446 [formerly 0bc501bd4c [formerly d53c809149da23fcae51138cc45c57aecd641794]]
Former-commit-id: 0bc501bd4c
Former-commit-id: 7839dab5e6
2015-01-22 16:05:41 -05:00
Dave Hladky
41b0ae02d4 Omaha #3918 Central registry web interface broken by DPA fix.
Former-commit-id: a15e67385a [formerly c1127b066f [formerly 5aa305adb5fd16c72ce557309cab28fd287379d9]]
Former-commit-id: c1127b066f
Former-commit-id: 5fd928ec4c
2015-01-22 13:22:18 -06:00
Ana Rivera
74d095524e VLab Issue #6082 - Patch for BinLightningDecoder.java; fixes #6082
Change-Id: Ide610d8209a7072dbcdc4bb7c26fc85cedc6e24f

Former-commit-id: 18b9d5d163 [formerly 7b47ffe362 [formerly 8a66266d3ffa236343f14089d7e7b32c1060f9ea]]
Former-commit-id: 7b47ffe362
Former-commit-id: 4f8900fd23
2015-01-22 16:11:44 +00:00
Juliya Dynina
7860814fa2 Merge "ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's" into asm_14.3.1
Former-commit-id: 7dfa9e281b [formerly 64d09c6982 [formerly 61f9feec5bf02baefbef740cc16cbc90688242ad]]
Former-commit-id: 64d09c6982
Former-commit-id: a72a325521
2015-01-21 09:08:36 -05:00
Qinglu.Lin
fe02279038 ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's
Change-Id: I843e5dd289c9e2841a28b228a8dbc38dce965ad1

Former-commit-id: 30b5bc6a62 [formerly 94ee166aa1 [formerly d4e1fca39f82eb39fc911c091eb579a785a6cef9]]
Former-commit-id: 94ee166aa1
Former-commit-id: 761fc43aad
2015-01-20 16:20:58 -05:00
Nate Jensen
88e656a34d Omaha #3993 ensure important dataplugin utility folders are included in
viz builds

Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747

Former-commit-id: b434ae1343 [formerly 05307be9d0 [formerly 9f30c7195d6a62206bae05d6e17df4a8e068255e]]
Former-commit-id: 05307be9d0
Former-commit-id: f88f62191f
2015-01-13 16:47:04 -06:00
Fay.Liang
8a6ed4ec3d ASM #15311 - Merge changes from asm_14.4.1 into master_14.4.1
Merge branch 'asm_14.4.1' into master_14.4.1

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java

Former-commit-id: a09a27a963 [formerly 13fb781066 [formerly 67315d8c5f28f5ed5e0870f65de30a9c2c2bd290]]
Former-commit-id: 13fb781066
Former-commit-id: 1934dedd2d
2015-01-13 14:35:30 -05:00
Ron Anderson
1cd011163c Issue #3990 Remove multiple smartInit restriction added by DR #3146
Change-Id: I6231da05828bcc76489793c7cf8acd29468b4516

Former-commit-id: 0dab6f4797 [formerly 03c265fc9f [formerly c4ba2394228935c7725688c11b91c3de130d586b]]
Former-commit-id: 03c265fc9f
Former-commit-id: 6248c878ff
2015-01-13 11:03:02 -06:00
Fay.Liang
8785b67d3f Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: a7708f9cf5 [formerly ffa13d9264 [formerly f0ed1b055a21c765e6dec0dde0a066089892dd06]]
Former-commit-id: ffa13d9264
Former-commit-id: 1ee2bb76da
2015-01-13 11:58:25 -05:00