Commit graph

3005 commits

Author SHA1 Message Date
Fay.Liang
52ae282416 Merge branch 'omaha_14.3.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.2
Former-commit-id: 00eaa4fef8 [formerly 300eadb096 [formerly 15e1cd65856586733aa8e99f2e5620f3c9b8a063]]
Former-commit-id: 300eadb096
Former-commit-id: 84c0c2dda9
2015-02-19 11:13:28 -05:00
Fay.Liang
1570a00f49 Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 608e249e84 [formerly 585dc560b4 [formerly 2a6f8f560b6fb3825e4127fcd5b15b6c5b215ae7]]
Former-commit-id: 585dc560b4
Former-commit-id: 5630c0dc37
2015-02-19 11:09:01 -05:00
David Gillingham
fb4cb8e67b Issue #4144: Fix python version SendPracticeProductRequest and VTECDecoder.py.
Change-Id: I1f85fc5d92034200014cfe464b51f4f2d8ae9080

Former-commit-id: 8c0a035702 [formerly 1e86f4cb13 [formerly dfbfd38194c88c70f3e75de06bfc7114c6bd3542]]
Former-commit-id: 1e86f4cb13
Former-commit-id: 632a6905a1
2015-02-18 13:07:56 -06:00
Sarah Pontius
b011d89c00 VLab Issue #6386 - HLS/TCV Beta Testing Changes; fixes #6386
Change-Id: Ica6e803b85c34e6d65fd268b844eaac06417909e

Former-commit-id: e4a1aa13f5 [formerly 564febcc4a [formerly 5fbb83dd042795e308ca8b6aa370e4f9b0fb3291]]
Former-commit-id: 564febcc4a
Former-commit-id: d9ffd6a710
2015-02-13 10:12:53 -07:00
Fay.Liang
e36e27681e Merge branch 'master_14.3.1' into master_14.3.2
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 07076f91aa [formerly 1e4522ddd2 [formerly 155801c3d418b6deb7e17ffb04c963a80d092c5a]]
Former-commit-id: 1e4522ddd2
Former-commit-id: 3c6247522e
2015-02-10 10:59:16 -05:00
Fay.Liang
97f8869b2e Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: c80c70e86d [formerly f8360d41ef [formerly 316d8f391992395e8dda3870742f5aea83b2bfe0]]
Former-commit-id: f8360d41ef
Former-commit-id: 98f7e2ccb4
2015-02-09 17:03:42 -05:00
Kiran.Shrestha
c0d137e30c ASM #17085 - lifted index issue reporting in units of Kelvin but labeled as Celsius
Change-Id: I004f3bab00aa82130ea21d888a1307f76ec58849

Former-commit-id: 89b18b15d7 [formerly a4f63f4147 [formerly 391a2576ade26ad7031e037db5e9695915212cd5]]
Former-commit-id: a4f63f4147
Former-commit-id: 8389938a6a
2015-02-09 21:06:36 +00:00
Fay.Liang
caeaee86aa Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: a638fef39f [formerly d39f7915e7 [formerly 67ec942e0c89cce314d9af5c8a1bf5392ce20e52]]
Former-commit-id: d39f7915e7
Former-commit-id: 801b7954c5
2015-02-05 16:16:18 -05:00
Matthew Howard
7d82890a68 Merge "ASM #16942 - GFE: VTEC Active Tables not getting purged" into asm_14.3.1
Former-commit-id: 11f704189c [formerly 11492ac96b [formerly 39dd1ff1608ec3a5aaf6a211e2280ecd68725d54]]
Former-commit-id: 11492ac96b
Former-commit-id: 26536ffb50
2015-02-05 15:39:31 -05:00
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
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
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
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
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
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
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
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
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
Sarah Pontius
5301e0245e VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
Change-Id: I0418ffe2cb01337f8549ea2c8021a8e5b566b563

Former-commit-id: 283f682aea [formerly 4bacb954fe [formerly 01f727b4b033f80a206533cbf5404c38d12a6fde]]
Former-commit-id: 4bacb954fe
Former-commit-id: 43bab0465c
2015-01-13 09:04:28 -07:00
Fay.Liang
63b0525354 Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 50ab069dbc [formerly d193ca5eb6 [formerly f0c6dcb30718baede5c31bcb267d3b4524252ab8]]
Former-commit-id: d193ca5eb6
Former-commit-id: a713238fc1
2015-01-12 14:55:55 -05:00
Ana Rivera
2b547231f5 Merge "VLab Issue #4953 Run NWRWAVES script for both TCV and HLS. Don't attempt to send TCV backup files in practice mode." into tcv_14.3.2
Former-commit-id: a07ca6b040 [formerly 3a08e54bfc [formerly 07634aa73cbb07182302518513a54ded9fd69641]]
Former-commit-id: 3a08e54bfc
Former-commit-id: 9efaf97304
2015-01-12 17:43:07 +00:00
Sarah Pontius
37f2fb4170 VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
Change-Id: I248822f54d31eb5e0a7312171acf1d59dde7c73d

Former-commit-id: 1159e8487c [formerly c31b766be6 [formerly 9cf4ca3c746accf745172bd7dc85e851da95ab6f]]
Former-commit-id: c31b766be6
Former-commit-id: 3225a94aef
2015-01-09 15:13:45 -07:00
Ron Anderson
cf23e60688 VLab Issue #4953 Run NWRWAVES script for both TCV and HLS.
Don't attempt to send TCV backup files in practice mode.

Change-Id: I70cc4a4014a0f1e34d8c2d3eab39a76289ca9daa

Former-commit-id: cd8f684a99 [formerly 57de590a3e [formerly 3a60037251b7dd393d85a613c5685d5338927e61]]
Former-commit-id: 57de590a3e
Former-commit-id: a1a11a4243
2015-01-09 10:48:51 -06:00
Fay.Liang
f550c8a8cd Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 77863309a9 [formerly 06061eee19 [formerly 0edb5ba1c9cad9e2933ab86d57ec5e4f355d244d]]
Former-commit-id: 06061eee19
Former-commit-id: 795b472fff
2014-12-22 14:43:32 -05:00
Ron Anderson
804649a91e VLab Issue #4953 Fix pracice mode decoding of non-VTEC products
Change-Id: I0e2e9a21267e7b9e3896154587a0e53841081d56

Former-commit-id: bde8257ec3 [formerly 7a0b6b2cab [formerly 4cddd47d0870f4ba3474238107381693c768f6b1]]
Former-commit-id: 7a0b6b2cab
Former-commit-id: 7e80850d54
2014-12-17 16:15:39 -06:00
Mike Duff
153ee82abf Issue #3026 - Implement last minute requirement change, change location of text on screen
Change-Id: I2f8fb480a3259bae71f7c09e46e393a413972378

Former-commit-id: 57f51e4c99 [formerly b98cc4c385 [formerly 773590a3936ca34be68cb5b19ae8fbf027085926]]
Former-commit-id: b98cc4c385
Former-commit-id: a5708994f7
2014-12-16 13:13:37 -06:00
Sarah Pontius
dcfbb02f17 VLab Issue #5682 - HLS/TCV SwIT Changes; fixes #5682
Former-commit-id: 734cc8a441 [formerly 0bd53be339 [formerly b5a49fa57d2168e4680b0329b99733e35381eeb9]]
Former-commit-id: 0bd53be339
Former-commit-id: 6a09b38c03
2014-12-16 09:06:59 -07:00
Steve Harris
cf41ae892e Merge branch 'master_14.3.1' (14.3.1-38) into omaha_14.3.1
Former-commit-id: f03969281c [formerly 8d61bfc358 [formerly 8b512a56879fe37cdb5e3428f6f3d86f38349ed6]]
Former-commit-id: 8d61bfc358
Former-commit-id: 5fb51b7855
2014-12-15 13:31:21 -06:00
Sarah Pontius
430120f6b9 VLab Issue #5674 - HLS/TCV Code Cleanup; fixes #5674
Change-Id: If31b2979fb741f0e258ae0e3a1323981826b3158

Former-commit-id: 9b8bdc88d5 [formerly ff2a0aa1b1 [formerly c044f5c349b27be19c6a3ea2abcc3c2294fc07a3]]
Former-commit-id: ff2a0aa1b1
Former-commit-id: 06ac198594
2014-12-15 09:54:17 -07:00
Ron Anderson
d5dc22de4d VLab Issue #4953 Added support for nwrwavestcv and sending TCV files to VTEC partners
Change-Id: I2af1f2eaf0625ea58153ebebc1ad10bb76da52bd

Former-commit-id: 2c99ce902a [formerly eaa74da50f [formerly 18ab45bdae51ae9971a0c5f4b4bde7afe82074d4]]
Former-commit-id: eaa74da50f
Former-commit-id: b484070ec5
2014-12-12 17:25:52 -06:00
Lee Venable
8db69312d9 Merge "Issue #3026 - Fixed the HPE bias query" into omaha_14.3.1
Former-commit-id: 4d212f1d09 [formerly 190565855d [formerly 51e1e12ff98b2f1270b0fbd43bd169c6adae6d76]]
Former-commit-id: 190565855d
Former-commit-id: 9ab36f2594
2014-12-12 13:53:21 -06:00
Mike Duff
4aa2893c92 Issue #3026 - Fixed the HPE bias query
Former-commit-id: 508cf4c1d5 [formerly f02b462933 [formerly f2d5395fe522e61edd5768f37b530299a197dd07]]
Former-commit-id: f02b462933
Former-commit-id: 1f8b9191ea
2014-12-12 11:16:15 -06:00
Steve Harris
5319a82bad Merge tag 'OB_14.3.2-8m' into tcv_14.3.2
Former-commit-id: 6d47b052c1 [formerly 1203bcc18c [formerly 4d97e95a23e55e064a654fda3d05901043158d7a]]
Former-commit-id: 1203bcc18c
Former-commit-id: eb980ff3ba
2014-12-11 10:43:57 -06:00
Fay.Liang
964b8fa4d4 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 8a4e1ba3ef [formerly 0df83cd043 [formerly ea5b97f1f606210e70bbf616a0c9158f03f67b5e]]
Former-commit-id: 0df83cd043
Former-commit-id: ecd2b21240
2014-12-10 08:52:21 -05:00
Sarah Pontius
46b621c669 VLab Issue #5595 - HLS/TCV remaining task work and bug fix for 14.3.2 SwIT; fixes #5595
Change-Id: I872c55de264205ee60c369802075b32b5753fe5d

Former-commit-id: a12b79c69c [formerly 1ed6581ceb [formerly f7aeeb643ec6302e5af82838992f68ecf48ce702]]
Former-commit-id: 1ed6581ceb
Former-commit-id: 91dd50792f
2014-12-09 12:49:45 -07:00
Ying-Lian.Shi
5c21331fe9 ASM #16929 Service Backup log cleanup script issue on test systems
Change-Id: I09f184a01081cf025854da60a298345b29ffc15f

Former-commit-id: c4b665ad24 [formerly d451c4b1f1 [formerly 66fc128c8be25753904dfff65840334bfdff7963]]
Former-commit-id: d451c4b1f1
Former-commit-id: 446b1927ee
2014-12-09 16:19:33 +00:00
Dave Hladky
4b7557498f Issue #3891 Special overlap handling for promotion of sub from site to shared
Change-Id: Ifa8f4be3e9e0f172ee54c5ef7021b912d45c5de2

Former-commit-id: 8796705c6b [formerly d81e3b0efa [formerly 9a31befafe66a677b744fa9ae9ef7e134a758bd9]]
Former-commit-id: d81e3b0efa
Former-commit-id: e897cb40df
2014-12-08 14:36:44 -06:00
Fay.Liang
7aaf379e07 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: f5095bed4e [formerly 028d6bdc33 [formerly ad2451c4d92ef4dcb35f6a0a4ef6ef9403886963]]
Former-commit-id: 028d6bdc33
Former-commit-id: 6e9ff9e139
2014-12-04 13:47:03 -05:00
Fay.Liang
07316a588b Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 19194e0aa3 [formerly 83a4987188 [formerly 1fcac564095b86cd4c6103a6484b25bbff2339b2]]
Former-commit-id: 83a4987188
Former-commit-id: f327b9dd5a
2014-12-04 13:46:31 -05:00
Sarah Pontius
5bc5175729 VLab Issue #5492 - Dec 2nd HLS/TCV Code Check-in for 14.3.2 SwIT; fixes #5492
Change-Id: I2d0b6fbe44cb2931fc0cd74a9361cf886b0c9565

Former-commit-id: 5d696b412d [formerly 171a802190 [formerly 24c01f47449607347812e0e676f1d14849d3b47e]]
Former-commit-id: 171a802190
Former-commit-id: 2b37fe2994
2014-12-03 11:19:06 -07:00
Fay.Liang
e1e29a8283 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 5bd22b74c6 [formerly 99263f79e1 [formerly 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9]]
Former-commit-id: 99263f79e1
Former-commit-id: 069db81e14
2014-11-20 13:32:25 -05:00
Shawn Hooper
c3da295cf3 VLab Issue #5395 - Build fixes and gfeConfig.py update
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: cf72b5753d [formerly b7369c5eef [formerly 94093accc4b2adc4c12cea0a3af0e037c1be52d8]]
Former-commit-id: b7369c5eef
Former-commit-id: fd57e5334c
2014-11-20 13:12:16 -05:00
Fay.Liang
2b49d6bc2d Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 45b80432d6 [formerly 29561d5324 [formerly 28c3dbd91c1e89ffffd19afa811a08e228a995dd]]
Former-commit-id: 29561d5324
Former-commit-id: a32ec39df2
2014-11-19 22:07:54 -05:00
Ana Rivera
c5366c9cd7 Merge "VLab Issue #4953 Added support for managing JSON files in practice mode." into tcv_14.3.2
Former-commit-id: 40855f4ebd [formerly 7dacc070d2 [formerly a0946643e3dab3f54c9d1d7a48dbb06b82207b55]]
Former-commit-id: 7dacc070d2
Former-commit-id: 419dc9ff10
2014-11-19 16:27:03 -05:00
Ana Rivera
9881e53e34 VLab Issue #5382 - HTI Update: add GFE templates (O&M RM16791); fixes #5382
Change-Id: I1a37fafbb9c2846749a33dd85772f53ccfb514df

Former-commit-id: af00fd8a98 [formerly 2c388bd379 [formerly 7d9cf7bfb3f513314608b6269f437061fc36d090]]
Former-commit-id: 2c388bd379
Former-commit-id: befcdc96f9
2014-11-19 20:29:42 +00:00