Steve Harris
85457e37cb
Merge tag 'OB_14.4.1-7m' into omaha_15.1.1
...
14.4.1-7
Former-commit-id: bf0368503a8defd41a20e369e154d560b93bee6c
2015-02-03 17:30:23 -06:00
Steve Harris
f428e16ebb
Merge tag 'OB_14.4.1-7m' into omaha_14.4.1
...
14.4.1-7
Former-commit-id: 88b43275725882327d4487733e3135489874de1f
2015-02-03 17:18:57 -06:00
Joshua Watson
af60ca1232
VLab Issue #5238 - changed parmsGFSLAMPGrid to GFSLAMPGridPARMS. Changed serverConfig.Vis to Vis on that same line; fixes #5238
...
Change-Id: I1724074899bad140a60c7f4da37622178ddba3c0
Former-commit-id: b32bdbe92d1db52997c9e79ece82df19f91357f3
2015-02-03 17:43:17 -05:00
Fay.Liang
07c742044d
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: 8f839ec64da04492e6cf109fdf47b95f08db5388
2015-02-03 16:04:56 -05:00
Steve Harris
8cd98ea3b9
Merge tag 'OB_14.4.1-6m' into omaha_15.1.1
...
14.4.1-6
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 9fd5ed1aea1a667552144da88dcc394a99133c52
2015-02-03 12:25:05 -06:00
Steve Harris
db185ed16c
Merge tag 'OB_14.4.1-6m' into omaha_14.4.1
...
14.4.1-6
Former-commit-id: 6873606777f0c7c18928b0b0814050742c256dc2
2015-02-03 11:24:39 -06:00
Fay.Liang
ae85ade54d
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 06a34c609a217ca98b027ac6d92a31faf802b668
2015-02-03 11:24:57 -05:00
Nate Jensen
25cd946168
Merge "Omaha #3945 Moved the ESB folder to deploy.edex.awips2 and updated the build scripts." into omaha_15.1.1
...
Former-commit-id: 611b6980c2f69ba515b2931afca366472a909e02
2015-02-02 13:01:03 -06:00
Richard Peter
166bf912bd
Merge "Omaha #4031 Implement preferrred AFOS first letter." into omaha_14.4.1
...
Former-commit-id: 28d8103fc3287f27edccc6187ca3df5d72726d97
2015-02-02 12:49:01 -06:00
Fay.Liang
4ddd4cec81
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: 307e986b8e9ce89ad1eb7b28f88afe82c2596f30
2015-02-02 10:06:58 -05:00
Matthew Howard
a1c925be94
Merge "ASM #17055 - fix activeTableChange logging" into asm_14.4.1
...
Former-commit-id: e14672d6e2b075792600c4d4d709044049e21d04
2015-01-30 14:29:49 -05:00
Ana Rivera
ea92049aac
Merge branch 'master_14.4.1' into gsd_14.4.1
...
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: d5996a81aad0809aaddbb8df99a985c86c66aaf8
2015-01-30 19:29:29 +00:00
Roger Ferrel
28f435a27f
Omaha #4031 Implement preferrred AFOS first letter.
...
Change-Id: I1c011beaf078d08c79c02863ac8afd01c7318645
Former-commit-id: 776989760fa936913006924efb1e84832ffec31f
2015-01-30 13:01:01 -06:00
Rici.Yu
969e5ca72b
ASM #17055 - fix activeTableChange logging
...
Change-Id: I863a43005685b5b73eb96d80f0ffa46d12ecfcbc
Former-commit-id: 777729392f9cdbbcfe3bbdd7ac4c19c714dfb31a
2015-01-30 13:19:40 -05:00
Zhidong.Hao
caa2ebde5e
ASM #647 GFE: Files not getting purged out of /awips2/GFESuite/products/ISC
...
Change-Id: I64fe04fb736e9dae2158d0dc1401af5795d2ddeb
Former-commit-id: 86cf0fa14af93c1bf35f57e566e19ad45fb34b34
2015-01-30 11:31:36 -05:00
Slav Korolev
2bb8bc22a6
Omaha #3220 - Performance - Safe Seas, Snow, Fog.
...
Former-commit-id: f8ee84a324b3653a75aa3c63a793eca412e1bd81
2015-01-29 14:50:02 -05:00
David Lovely
fa557d08e3
Omaha #3945 Moved the ESB folder to deploy.edex.awips2 and updated the build scripts.
...
Former-commit-id: b9868fc974226fe6b003b0361ce1b18507b2d810
2015-01-28 15:15:15 -06:00
Steve Harris
995d60fb54
Merge tag 'OB_14.4.1-5m' into omaha_15.1.1
...
14.4.1-5
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
Former-commit-id: 28075dabb4b6421ddaee3af71518f565d9bc7e90
2015-01-28 13:45:36 -06:00
Fay.Liang
8aa0a2a200
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: 8c72e62260026a2d1d2fb41839f1e79535b09b7f
2015-01-28 14:31:02 -05:00
Steve Harris
9927bac8ed
Merge tag 'OB_14.4.1-5m' into omaha_14.4.1
...
14.4.1-5
Former-commit-id: 6f10c0ebeb8956fd0d12f424ddd9b09bdc4b4021
2015-01-28 12:57:55 -06:00
Ana Rivera
8bfa7c4087
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: 291d66c66af4f1f4d298185412d5930714ffb2c5
2015-01-27 22:05:59 +00:00
Steve Harris
716879f58b
Merge tag 'OB_14.4.1-4m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/DataProviderEventController.java
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/AlertalarmRecord.java
Former-commit-id: 714ca199f27013313099920bb9f55009c794f7f8
2015-01-27 11:56:24 -06:00
Steve Harris
1891ed5e5b
Merge branch 'master_14.4.1' (14.4.1-4) into omaha_14.4.1
...
Former-commit-id: cfd0a31a17fc4a92af6db3f034d46b01996d2cc0
2015-01-27 11:34:06 -06:00
Fay.Liang
d29d86ad05
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 6ad30059fa7249aba100a39c7c39215212a929cc
2015-01-27 12:08:28 -05:00
Ana Rivera
7c5fc26537
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: 889608360567b829f81ed6392c64c669798f34a9
2015-01-27 16:28:42 +00:00
Shawn.Hooper
9ca10f111a
ASM #17071 - Add tokens for Alert Alarm System
...
Change-Id: Idec6bd4aabe6d317c1cc168113a346567d30b189
Former-commit-id: 2bba487d259e87c20e43a8e10573392dca011206
2015-01-27 11:22:56 -05:00
Ron Anderson
d97b54018c
Merge "Omaha #4033 Fix logging in configureTextProducts" into omaha_14.4.1
...
Former-commit-id: aa7900e79f0ce9074c32ad0785dd9d0ccbfa64ba
2015-01-27 08:59:12 -06:00
Ron Anderson
13bfa6e362
Omaha #4033 Fix logging in configureTextProducts
...
Change-Id: I1d2de04b532a3d543418d42c76e499cde2c04030
Former-commit-id: 1c1fefe7cc5cf26abf7c60254132ddeb22585b26
2015-01-26 17:50:28 -06:00
Ana Rivera
98ac97e397
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: 51ef304bd94fd003a1e7349a22c41e21b340ac8a
2015-01-26 18:45:26 +00:00
Shawn.Hooper
568b7c801a
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 95cdc2d817eac840017fc14746c2ada498f1a716
2015-01-26 11:22:49 -05:00
Nate Jensen
63189329a1
Omaha #3952 remove custom gzip handling since it is by default enabled
...
by apache httpclient
Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802
Former-commit-id: 4f67ebeb092d182ec0a4e5078e668313d8cc6a57
2015-01-26 09:10:36 -06:00
Roger Ferrel
5e91714487
Omaha #3763 Update xml tags to match labels in the ArchiveRetentionDlg dialog.
...
Change-Id: I9d8344fdecb16d75bfa360d403ab84312f6bfe0e
Former-commit-id: 083ba10ef9ecdae0c2a242f432641b7659fdc822
2015-01-26 07:46:00 -06:00
Steve Harris
2c559f4c88
Merge tag 'OB_14.4.1-2m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py (self-resolved)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml (took both Anna and David's additions)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py (took both Anna and David's additions)
Former-commit-id: 01c4aa19ab0b21f331c2200076efbd44eb3b2af6
2015-01-23 09:32:44 -06:00
Steve Harris
158fa16376
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: 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79
2015-01-23 09:08:06 -06:00
Daniel.Huffman
845998cbfa
ASM #17057 RadarDecoder::AlertMessageSanityCheck
...
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c
Former-commit-id: 498f55c757f20f70b11a921a2e5948c3c7c49c90
2015-01-22 21:13:04 +00:00
Shawn.Hooper
0bc501bd4c
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: d53c809149da23fcae51138cc45c57aecd641794
2015-01-22 16:05:41 -05:00
Dave Hladky
c1127b066f
Omaha #3918 Central registry web interface broken by DPA fix.
...
Former-commit-id: 5aa305adb5fd16c72ce557309cab28fd287379d9
2015-01-22 13:22:18 -06:00
Nathan Bowler
efd13e5442
Omaha #3949 Add lightning source to SCAN site run config and filter on it.
...
Change-Id: Ic8a13effa112f6858a34b07c65ddae5a592d9be5
Former-commit-id: 4817945b7eadadca996dd1e3d037a2b2de297ec4
2015-01-22 12:15:00 -05:00
Ana Rivera
7b47ffe362
VLab Issue #6082 - Patch for BinLightningDecoder.java; fixes #6082
...
Change-Id: Ide610d8209a7072dbcdc4bb7c26fc85cedc6e24f
Former-commit-id: 8a66266d3ffa236343f14089d7e7b32c1060f9ea
2015-01-22 16:11:44 +00:00
Juliya Dynina
64d09c6982
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: 61f9feec5bf02baefbef740cc16cbc90688242ad
2015-01-21 09:08:36 -05:00
Ron Anderson
6b8705ee39
Omaha #4013 Change rsyncGrdsToCWF_client.sh to use any available EDEX cluster member
...
Change-Id: If2370cf73ec816bbac2a9b46ebbc8fb720eae805
Former-commit-id: e2f809e7b48f83b5abeb4dcda0c7e96a160e7fbf
2015-01-20 16:46:47 -06:00
Qinglu.Lin
94ee166aa1
ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's
...
Change-Id: I843e5dd289c9e2841a28b228a8dbc38dce965ad1
Former-commit-id: d4e1fca39f82eb39fc911c091eb579a785a6cef9
2015-01-20 16:20:58 -05:00
David Gillingham
41af2f661c
Omaha #4014 : Add ingest and display support for ETSS model.
...
Change-Id: I5bff5985d779a9d665cbe5a005171b2076212846
Former-commit-id: fa7e11a22b47a48d2bc7b9cf6f0ddfd97ea2fea7
2015-01-20 14:02:06 -06:00
Ron Anderson
03df152b3d
Merge "Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data" into omaha_15.1.1
...
Former-commit-id: 27d20161a120d027cc0d2ed892384cdc00faeba5
2015-01-19 15:08:31 -06:00
Ron Anderson
b58904fe25
Merge "Omaha #3955 Move GridType enum into GridParmInfo where it belongs" into omaha_15.1.1
...
Former-commit-id: e541806ce417494bb65248a5d09f8fa5585bedd9
2015-01-19 15:08:08 -06:00
Ron Anderson
596149053f
Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data
...
Change-Id: Ic12b1e257b7997fc2fbc5efd7a8833ac26366135
Former-commit-id: 653d8ec5a7adfc2ebb87ec6cbde2715f9c8fcfe9
2015-01-19 14:02:42 -06:00
Ron Anderson
5dfd9d6f8c
Omaha #3955 Move GridType enum into GridParmInfo where it belongs
...
Change-Id: Ia9265527302d8ff9213e8f55f63e5b6b91bdcd98
Former-commit-id: 9bad7ebc912f6dbf9642f250494a992bc522252c
2015-01-16 12:33:52 -06:00
Ron Anderson
899235138c
Merge "Omaha #3996 NullPointerException Occurs when Drawing and Issuing Hazards" into omaha_15.1.1
...
Former-commit-id: c6cacfdda1724ff43da04221f5fc2fbb0d9e3ae2
2015-01-16 11:03:14 -06:00
Richard Peter
a754644505
Merge "Omaha #3789 removed unnecessary arguments to uengine jetty endpoint" into omaha_15.1.1
...
Former-commit-id: 7f514d51ea7858681fa22e923677e6f4e9d51631
2015-01-15 13:43:12 -06:00
Brian Clements
44acb69ede
Omaha #3789 removed unnecessary arguments to uengine jetty endpoint
...
Change-Id: I9442351c05ecf4a67ea05b536ef94bbd26c214f3
Former-commit-id: 9f1eee3bcf4eb5e72c433055d2f2b5727056ee39
2015-01-15 09:28:26 -06:00
