Ana Rivera
122f2404f8
Merge branch master_14.3.2 'OB_14.3.2-15m' into tcv_14.3.2
...
Change-Id: I798ce412136ee0f30123835338920a4607909e1d
Former-commit-id: ad45aae7503d882eed46
2015-02-23 15:15:18 +00:00
Sarah Pontius
d9ffd6a710
VLab Issue #6386 - HLS/TCV Beta Testing Changes; fixes #6386
...
Change-Id: Ica6e803b85c34e6d65fd268b844eaac06417909e
Former-commit-id: e4a1aa13f5564febcc4a
2015-02-13 10:12:53 -07:00
Fay.Liang
3c6247522e
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: 07076f91aa1e4522ddd2
2015-02-10 10:59:16 -05:00
Fay.Liang
98f7e2ccb4
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: c80c70e86df8360d41ef
2015-02-09 17:03:42 -05:00
Kiran.Shrestha
8389938a6a
ASM #17085 - lifted index issue reporting in units of Kelvin but labeled as Celsius
...
Change-Id: I004f3bab00aa82130ea21d888a1307f76ec58849
Former-commit-id: 89b18b15d7a4f63f4147
2015-02-09 21:06:36 +00:00
Fay.Liang
801b7954c5
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: a638fef39fd39f7915e7
2015-02-05 16:16:18 -05:00
Matthew Howard
26536ffb50
Merge "ASM #16942 - GFE: VTEC Active Tables not getting purged" into asm_14.3.1
...
Former-commit-id: 11f704189c11492ac96b
2015-02-05 15:39:31 -05:00
Rici.Yu
8a5e418304
ASM #16942 - GFE: VTEC Active Tables not getting purged
...
Change-Id: Ib71d667d8f59ab1fa3c669653d2bc8636bd7901c
Former-commit-id: 14bb4d4d5948dcae9064
2015-02-05 15:22:49 -05:00
Shawn.Hooper
9c9bb841ca
ASM #17100 - Revert "VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563 "
...
This reverts commit cbc7d2813fbf5bb1bacfbfc550b378fa9e3791cb0ac88acf05
2015-02-05 10:30:29 -05:00
Mike Duff
9e6dbcb03d
Issue #4030 - Added check for blank lines
...
Former-commit-id: b9557d58b8bd16f5b1d1
2015-02-04 16:59:37 -06:00
Steve Harris
c3bb810eb1
Merge branch 'master_14.3.1' (14.3.1-48) into omaha_14.3.1
...
Former-commit-id: 7302d69de31cffbb7cab
2015-02-03 17:16:23 -06:00
Roger Ferrel
7be8540aec
Issue #4066 Added Earth Networks Total Lightning to pqact.template and RAW_DATA.xml
...
Change-Id: I09ccfea7e02134339771550fb915bb3516067320
Former-commit-id: 6e4b93ed15ba9e38efb2
2015-02-03 11:58:13 -06:00
Richard Peter
40b8dd0dad
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: 754a99cd97046af0d200
2015-02-02 12:25:56 -06:00
Mike Duff
e55804c0b4
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: 8f2350f66071cc843faa
2015-02-02 12:06:05 -06:00
Fay.Liang
99b1511120
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: 15f28c02454ddd4cec81
2015-02-02 10:06:58 -05:00
Ying-Lian.Shi
c2798efc95
ASM #17081 Service Backup - add vtec
...
Change-Id: Id2e4d8024699c3a95c1c945919fc757b72d3d1aa
Former-commit-id: 55674f46fabf2d61894f
2015-01-30 23:01:23 +00:00
Shawn.Hooper
0a91e7cf47
ASM #17071 - Add tokens for Alert Alarm System
...
Change-Id: Idec6bd4aabe6d317c1cc168113a346567d30b189
Former-commit-id: 87575853869ca10f111a
2015-01-27 11:22:56 -05:00
Juliya Dynina
a72a325521
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: 7dfa9e281b64d09c6982
2015-01-21 09:08:36 -05:00
Qinglu.Lin
761fc43aad
ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's
...
Change-Id: I843e5dd289c9e2841a28b228a8dbc38dce965ad1
Former-commit-id: 30b5bc6a6294ee166aa1
2015-01-20 16:20:58 -05:00
Ron Anderson
6248c878ff
Issue #3990 Remove multiple smartInit restriction added by DR #3146
...
Change-Id: I6231da05828bcc76489793c7cf8acd29468b4516
Former-commit-id: 0dab6f479703c265fc9f
2015-01-13 11:03:02 -06:00
Fay.Liang
1ee2bb76da
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: a7708f9cf5ffa13d9264
2015-01-13 11:58:25 -05:00
Sarah Pontius
43bab0465c
VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
...
Change-Id: I0418ffe2cb01337f8549ea2c8021a8e5b566b563
Former-commit-id: 283f682aea4bacb954fe
2015-01-13 09:04:28 -07:00
Fay.Liang
a713238fc1
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: 50ab069dbcd193ca5eb6
2015-01-12 14:55:55 -05:00
Ana Rivera
9efaf97304
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: a07ca6b0403a08e54bfc
2015-01-12 17:43:07 +00:00
Sarah Pontius
3225a94aef
VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
...
Change-Id: I248822f54d31eb5e0a7312171acf1d59dde7c73d
Former-commit-id: 1159e8487cc31b766be6
2015-01-09 15:13:45 -07:00
Ron Anderson
a1a11a4243
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: cd8f684a9957de590a3e
2015-01-09 10:48:51 -06:00
Fay.Liang
795b472fff
Merge branch 'master_14.3.1' into master_14.3.2
...
Former-commit-id: 77863309a906061eee19
2014-12-22 14:43:32 -05:00
Ron Anderson
7e80850d54
VLab Issue #4953 Fix pracice mode decoding of non-VTEC products
...
Change-Id: I0e2e9a21267e7b9e3896154587a0e53841081d56
Former-commit-id: bde8257ec37a0b6b2cab
2014-12-17 16:15:39 -06:00
Mike Duff
a5708994f7
Issue #3026 - Implement last minute requirement change, change location of text on screen
...
Change-Id: I2f8fb480a3259bae71f7c09e46e393a413972378
Former-commit-id: 57f51e4c99b98cc4c385
2014-12-16 13:13:37 -06:00
Sarah Pontius
6a09b38c03
VLab Issue #5682 - HLS/TCV SwIT Changes; fixes #5682
...
Former-commit-id: 734cc8a4410bd53be339
2014-12-16 09:06:59 -07:00
Steve Harris
5fb51b7855
Merge branch 'master_14.3.1' (14.3.1-38) into omaha_14.3.1
...
Former-commit-id: f03969281c8d61bfc358
2014-12-15 13:31:21 -06:00
Sarah Pontius
06ac198594
VLab Issue #5674 - HLS/TCV Code Cleanup; fixes #5674
...
Change-Id: If31b2979fb741f0e258ae0e3a1323981826b3158
Former-commit-id: 9b8bdc88d5ff2a0aa1b1
2014-12-15 09:54:17 -07:00
Ron Anderson
b484070ec5
VLab Issue #4953 Added support for nwrwavestcv and sending TCV files to VTEC partners
...
Change-Id: I2af1f2eaf0625ea58153ebebc1ad10bb76da52bd
Former-commit-id: 2c99ce902aeaa74da50f
2014-12-12 17:25:52 -06:00
Lee Venable
9ab36f2594
Merge "Issue #3026 - Fixed the HPE bias query" into omaha_14.3.1
...
Former-commit-id: 4d212f1d09190565855d
2014-12-12 13:53:21 -06:00
Mike Duff
1f8b9191ea
Issue #3026 - Fixed the HPE bias query
...
Former-commit-id: 508cf4c1d5f02b462933
2014-12-12 11:16:15 -06:00
Steve Harris
eb980ff3ba
Merge tag 'OB_14.3.2-8m' into tcv_14.3.2
...
Former-commit-id: 6d47b052c11203bcc18c
2014-12-11 10:43:57 -06:00
Fay.Liang
ecd2b21240
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 8a4e1ba3ef0df83cd043
2014-12-10 08:52:21 -05:00
Sarah Pontius
91dd50792f
VLab Issue #5595 - HLS/TCV remaining task work and bug fix for 14.3.2 SwIT; fixes #5595
...
Change-Id: I872c55de264205ee60c369802075b32b5753fe5d
Former-commit-id: a12b79c69c1ed6581ceb
2014-12-09 12:49:45 -07:00
Ying-Lian.Shi
446b1927ee
ASM #16929 Service Backup log cleanup script issue on test systems
...
Change-Id: I09f184a01081cf025854da60a298345b29ffc15f
Former-commit-id: c4b665ad24d451c4b1f1
2014-12-09 16:19:33 +00:00
Dave Hladky
e897cb40df
Issue #3891 Special overlap handling for promotion of sub from site to shared
...
Change-Id: Ifa8f4be3e9e0f172ee54c5ef7021b912d45c5de2
Former-commit-id: 8796705c6bd81e3b0efa
2014-12-08 14:36:44 -06:00
Fay.Liang
6e9ff9e139
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: f5095bed4e028d6bdc33
2014-12-04 13:47:03 -05:00
Fay.Liang
f327b9dd5a
Merge branch 'master_14.3.1' into master_14.3.2
...
Former-commit-id: 19194e0aa383a4987188
2014-12-04 13:46:31 -05:00
Sarah Pontius
2b37fe2994
VLab Issue #5492 - Dec 2nd HLS/TCV Code Check-in for 14.3.2 SwIT; fixes #5492
...
Change-Id: I2d0b6fbe44cb2931fc0cd74a9361cf886b0c9565
Former-commit-id: 5d696b412d171a802190
2014-12-03 11:19:06 -07:00
Fay.Liang
069db81e14
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: 5bd22b74c699263f79e1
2014-11-20 13:32:25 -05:00
Shawn Hooper
fd57e5334c
VLab Issue #5395 - Build fixes and gfeConfig.py update
...
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1
Former-commit-id: cf72b5753db7369c5eef
2014-11-20 13:12:16 -05:00
Fay.Liang
a32ec39df2
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: 45b80432d629561d5324
2014-11-19 22:07:54 -05:00
Ana Rivera
419dc9ff10
Merge "VLab Issue #4953 Added support for managing JSON files in practice mode." into tcv_14.3.2
...
Former-commit-id: 40855f4ebd7dacc070d2
2014-11-19 16:27:03 -05:00
Ana Rivera
befcdc96f9
VLab Issue #5382 - HTI Update: add GFE templates (O&M RM16791); fixes #5382
...
Change-Id: I1a37fafbb9c2846749a33dd85772f53ccfb514df
Former-commit-id: af00fd8a982c388bd379
2014-11-19 20:29:42 +00:00
Ron Anderson
f88fc45470
VLab Issue #4953 Added support for managing JSON files in practice mode.
...
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8
Former-commit-id: 9104023408bb451e58c3
2014-11-19 11:31:49 -06:00
Roger Ferrel
85d717b49c
Issue #3439 Replaced GFS213 with GFS229.
...
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15
Former-commit-id: b88300a5fc90a8b262f3
2014-11-18 17:42:39 -06:00
