Steve Harris
|
3fe3d35339
|
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
14.4.1-10
Former-commit-id: 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2
|
2015-02-11 15:53:38 -06:00 |
|
Fay.Liang
|
59f3f87190
|
Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: e91a78eec910b84f44350d3aae68a26f4e0dcd72
|
2015-02-09 17:19:41 -05:00 |
|
Greg Armendariz
|
2a554c5498
|
Omaha #3299 - Modify RCM deploy script
Change-Id: I420acc08705ebc2f52cd52ab7954b4d8c16fef15
Former-commit-id: 97c6bded155fc58e59beecdb33016e5286e622c1
|
2015-02-06 11:20:43 -06:00 |
|
Fay.Liang
|
551e3dfac0
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 999467410f61f1874d5cf1e599fca9ce83ae4f70
|
2015-02-04 16:51:19 -05:00 |
|
Shawn.Hooper
|
a98b54a944
|
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: f1383bbdbadc54f8f2a0384d319c70160464a3ac
|
2015-02-04 16:47:26 -05:00 |
|
Fay.Liang
|
fa2ec69693
|
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 85751935d73a6c64fd041c791ddb09f081831e20
|
2015-02-04 16:20:31 -05:00 |
|
David Friedman
|
beb5074ddd
|
ASM #17009 - Add Guam to countyTypes.txt file to account for "no counties"
Change-Id: Ic8dc2519b1cfb35bf3a2e0d8d61c007e108429a8
Former-commit-id: 61ee73806f184b0d4092b8474f18b3525d92a20b
|
2015-02-04 19:56:47 +00: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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
Nate Jensen
|
05307be9d0
|
Omaha #3993 ensure important dataplugin utility folders are included in
viz builds
Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747
Former-commit-id: 9f30c7195d6a62206bae05d6e17df4a8e068255e
|
2015-01-13 16:47:04 -06:00 |
|
Fay.Liang
|
13fb781066
|
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: 67315d8c5f28f5ed5e0870f65de30a9c2c2bd290
|
2015-01-13 14:35:30 -05:00 |
|
Ron Anderson
|
03c265fc9f
|
Issue #3990 Remove multiple smartInit restriction added by DR #3146
Change-Id: I6231da05828bcc76489793c7cf8acd29468b4516
Former-commit-id: c4ba2394228935c7725688c11b91c3de130d586b
|
2015-01-13 11:03:02 -06:00 |
|
Fay.Liang
|
ffa13d9264
|
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: f0ed1b055a21c765e6dec0dde0a066089892dd06
|
2015-01-13 11:58:25 -05:00 |
|
Sarah Pontius
|
4bacb954fe
|
VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
Change-Id: I0418ffe2cb01337f8549ea2c8021a8e5b566b563
Former-commit-id: 01f727b4b033f80a206533cbf5404c38d12a6fde
|
2015-01-13 09:04:28 -07:00 |
|
Fay.Liang
|
d193ca5eb6
|
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: f0c6dcb30718baede5c31bcb267d3b4524252ab8
|
2015-01-12 14:55:55 -05:00 |
|
Slav Korolev
|
9c57dab437
|
Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers.
Former-commit-id: 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e
|
2015-01-12 14:32:31 -05:00 |
|
Fay.Liang
|
c6bd5d7675
|
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
|
2015-01-12 13:03:31 -05:00 |
|
Ana Rivera
|
3a08e54bfc
|
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: 07634aa73cbb07182302518513a54ded9fd69641
|
2015-01-12 17:43:07 +00:00 |
|
Nate Jensen
|
44f0f7aafc
|
Merge "Omaha #3918 Fix for standalone clients not starting due to central registry non-existance. Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292" into omaha_14.4.1
Former-commit-id: 5fc926b7e735f2c92b16a85a7ba5f663a443ea53
|
2015-01-12 09:22:30 -06:00 |
|
Sarah Pontius
|
c31b766be6
|
VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
Change-Id: I248822f54d31eb5e0a7312171acf1d59dde7c73d
Former-commit-id: 9cf4ca3c746accf745172bd7dc85e851da95ab6f
|
2015-01-09 15:13:45 -07:00 |
|