Ana Rivera
|
171a38175c
|
Merge branch 'emc_14.4.1' of gerrit:AWIPS2_Dev_Baseline into emc_14.4.1
Former-commit-id: 6c72e1864ad5843c4ac42a558b589777af047c77
|
2015-01-26 19:04:54 +00: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 |
|
Ana Rivera
|
705f02f2be
|
VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278
Former-commit-id: 653472d785f4af6fef8f2edd93c2e538806096ab
|
2015-01-23 14:21:22 +00: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 |
|
Rici.Yu
|
cd7212c689
|
ASM #14946 - GFE: ZFP displaying time for office timezone for zones in different timezone
Change-Id: I082b26ffea4b228baf4f40afb019994d5fe1e7dd
Former-commit-id: 18ab87670fbdd007e5027553d4ee58262ae54f22
|
2014-12-16 15:34:35 -05:00 |
|
Richard Peter
|
2457d0e6f7
|
Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java
Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5
Former-commit-id: e190a710b1b9506c99120fdaa1ebfdb144fcbf6f
|
2014-12-12 10:36:04 -06:00 |
|
Fay.Liang
|
028d6bdc33
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: ad2451c4d92ef4dcb35f6a0a4ef6ef9403886963
|
2014-12-04 13:47:03 -05:00 |
|
Bruce.Hundermark
|
6f73b491f8
|
ASM #645 - GFE: CarSnowAmt smart tool can return incorrect amount
Change-Id: I8aea3ab2ccfec7e411e605ddfdfeef0a823687c2
Former-commit-id: 25f4c8acdd8975d3001528212cbc7617cfd39500
|
2014-12-04 15:56:01 +00:00 |
|
Sarah Pontius
|
171a802190
|
VLab Issue #5492 - Dec 2nd HLS/TCV Code Check-in for 14.3.2 SwIT; fixes #5492
Change-Id: I2d0b6fbe44cb2931fc0cd74a9361cf886b0c9565
Former-commit-id: 24c01f47449607347812e0e676f1d14849d3b47e
|
2014-12-03 11:19:06 -07:00 |
|
Rici.Yu
|
fb347e4a93
|
ASM #625 - modify checkGroup() to display models in multiple columns if needed
Change-Id: I94c5400d21b10b57cf08f4767a5160bfcc554eb9
Former-commit-id: 07c826efbcfe30dc3fc178601e550a6dbd31eb0b
|
2014-12-02 17:05:56 -05:00 |
|
Ron Anderson
|
4efd17db74
|
Omaha #3875 Fixed SmartScript.createTimeRange(). Added API to better deal with local time.
Change-Id: I8e6f79bf6b7754924480a39f1631ba10a12bdcae
Former-commit-id: e656ec3ccf20ae4a9eae23040e1a08d7032ee42a
|
2014-12-02 11:45:05 -06:00 |
|
Ana Rivera
|
709d571947
|
VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f
Former-commit-id: 6866439b0a7075f04146af4b4bdce59477269f4d
|
2014-12-02 15:44:07 +00:00 |
|
Ana Rivera
|
0e8473e91e
|
VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
This reverts commit c245f3a3c4 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1].
Change-Id: I631bb1722abea96e08967a8d9fa9f175a886f685
Former-commit-id: 373acfce57d5e0044f13382b926cb2fc1f830e54
|
2014-12-02 13:43:03 +00:00 |
|
Zhidong.Hao
|
cfe7f318d8
|
ASM #649 BOIVerifySumTemps crashes on dbName
Change-Id: Iaf05fcbae36ca0afe4c7350b4acf512f8b25111c
Former-commit-id: 164a7a624780596376b68b7488257b94d4661e80
|
2014-11-26 14:10:27 -05:00 |
|
Zhidong.Hao
|
a7019b2c0c
|
ASM #633 GFE: SmartScript method loadParm() exception handler broken
Change-Id: Ic7bef317b06dd695889bcc72cceee4ef41b147bc
Former-commit-id: 12ed9574fa7f62d200d50419f88b8ab773930e7a
|
2014-11-26 13:52:01 -05:00 |
|
Fay.Liang
|
744fc3f9d7
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 21e36577299266c03c8d860afa844cae29538b0f
|
2014-11-21 13:48:43 -05:00 |
|
Fay.Liang
|
00a63ad80c
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 9daaa34c341929f784628782c98d5edcf9944ed2
|
2014-11-21 09:31:58 -05:00 |
|
Ana Rivera
|
1645ccd9ca
|
Merge branch 'master_14.4.1' into emc_14.4.1
Change-Id: I4984b06810f3484e919a4a4a5853435ca34167bb
Former-commit-id: c69e94f227cb908a9af2e1cd2db35b25bef28701
|
2014-11-21 14:23:49 +00:00 |
|
Ana Rivera
|
250ba9f14c
|
VLab Issue #5408 - TCV Update: TCVDictionary.py (O&M RM14468); fixes #5408
Change-Id: If7b45b6415653efe11485956755cd7aaeb49356b
Former-commit-id: 82e3e8e69e7ebe738a84603c6f901d619004fe8a
|
2014-11-21 13:19:59 +00:00 |
|
Ron Anderson
|
9485f33476
|
VLab Issue #4953 Build fix and another cleanup item.
Change-Id: I5d92df3f452259c93784cd19e75cc7efd8e04dc4
Former-commit-id: 7a33861e7ac4475855778f50e0a5fca5227e5f97
|
2014-11-20 17:07:58 -06:00 |
|
Shawn Hooper
|
31d8337c56
|
VLab Issue #5395 - Update gfeConfig.py based on Pablo's email
Change-Id: I100a8d2bb79092bca2157bba018566a650c55f4a
Former-commit-id: c5278c1a2d81d995ae9df252c461123bcc870320
|
2014-11-20 17:11:42 -05:00 |
|
Fay.Liang
|
99263f79e1
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9
|
2014-11-20 13:32:25 -05:00 |
|
Shawn Hooper
|
b7369c5eef
|
VLab Issue #5395 - Build fixes and gfeConfig.py update
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1
Former-commit-id: 94093accc4b2adc4c12cea0a3af0e037c1be52d8
|
2014-11-20 13:12:16 -05:00 |
|
Ana Rivera
|
29ff0e472b
|
VLab Issue #5388 - HTI Update: replace 'MFL' references with SITE in HTI.xml (O&M RM16791); fixes #5388
Change-Id: I69ead4e0ed1103ca21728e46fa654ebaa85258a0
Former-commit-id: 27d2c6133b5563614b88fa03e3e706c6da2070a4
|
2014-11-20 13:57:19 +00:00 |
|
Fay.Liang
|
29561d5324
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 28c3dbd91c1e89ffffd19afa811a08e228a995dd
|
2014-11-19 22:07:54 -05:00 |
|
Ana Rivera
|
7dacc070d2
|
Merge "VLab Issue #4953 Added support for managing JSON files in practice mode." into tcv_14.3.2
Former-commit-id: a0946643e3dab3f54c9d1d7a48dbb06b82207b55
|
2014-11-19 16:27:03 -05:00 |
|
Ana Rivera
|
2c388bd379
|
VLab Issue #5382 - HTI Update: add GFE templates (O&M RM16791); fixes #5382
Change-Id: I1a37fafbb9c2846749a33dd85772f53ccfb514df
Former-commit-id: 7d9cf7bfb3f513314608b6269f437061fc36d090
|
2014-11-19 20:29:42 +00:00 |
|
Ron Anderson
|
bb451e58c3
|
VLab Issue #4953 Added support for managing JSON files in practice mode.
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8
Former-commit-id: e8ac81c5850b8565ea1e375857cf9dfe531848a0
|
2014-11-19 11:31:49 -06:00 |
|
Ana Rivera
|
ac523f4a45
|
VLab Issue #5355 - HTI Update: TCFloodingRainThreat.py (O&M RM16791); fixes #5355
Change-Id: I6461bf9294f037a361f02d3a0de83bf41147e819
Former-commit-id: 682cf4e6376265d0e590cfd1c05f7591204d0e0a
|
2014-11-18 16:06:22 +00:00 |
|
Fay.Liang
|
766685c4ec
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 7fd3b02016b0d9eed7ecca9c2fd70c3f83695abc
|
2014-11-14 12:47:46 -05:00 |
|
Ana Rivera
|
061fd0af28
|
VLab Issue #5318 - Baseline Hurricane Threats and Impacts (O&M RM16791); fixes #5318
Change-Id: Ibbc9e39a294417524c57c86e68e92644433ba847
Former-commit-id: 8a4e53a23a222dc88e3db8cc053fc31c33d3ed42
|
2014-11-14 16:58:11 +00:00 |
|
Fay.Liang
|
3ed251486c
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 3f94c7f0ddbf580576b435a715366e3b9f3d9a53
|
2014-11-13 11:50:16 -05:00 |
|
Ron Anderson
|
04b8ffbcd2
|
VLab Issue #4953 Added support for writing Python and/or Java objects to JSON localization files.
Change-Id: Ie25fce637e4294dd20bcfa3933d29b7bf6cc1f30
Former-commit-id: c9d45db2fe6d4693c02b8788d0c7d44b21f5359f
|
2014-11-12 14:50:21 -06:00 |
|
Fay.Liang
|
74d7123627
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: a141921090ecec459e99d448025f58ca6a957fa6
|
2014-11-10 14:08:25 -05:00 |
|
Sarah Pontius
|
1ae8fe99aa
|
VLab Issue #5277 - HLS/TCV code for OPG 11-17-2014; fixes #5277
Change-Id: I258b2f8c8ddb7f45b02b1035f6fa5006b9fabe1b
Former-commit-id: 0db3944372ecc381df4e8a918829530391d598db
|
2014-11-10 11:20:09 -07:00 |
|
Brian.Dyke
|
a6f8a3b109
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: bc44629025f7070a97fcff4a00939e509e6987b1
|
2014-10-29 16:39:06 -04:00 |
|
Sarah Pontius
|
d7e8bc97b6
|
VLab Issue #5129 - Merging code from tropical_hazard_formatters to tcv_14.3.2; fixes #5129
Change-Id: Ia7365620c5cc803faa25af4d6c32d3e394497626
Former-commit-id: eee97946890b5b0df941e2665a4a183eece14598
|
2014-10-29 13:33:24 -06:00 |
|
Steve Harris
|
0322884798
|
Merge tag 'OB_14.3.1-29m' into omaha_14.4.1
Former-commit-id: e5cd617f80e90dcfba52058b2a439fade1cfe15e
|
2014-10-29 10:03:20 -05:00 |
|
Ron Anderson
|
8b32ac8f54
|
Merge "Omaha #3685 Add support for sending specific products in mixed case" into omaha_14.4.1
Former-commit-id: 453e478604f048ae019eeee9bb8e46883b58254e
|
2014-10-28 15:15:16 -05:00 |
|
Steve Harris
|
1b83d045ea
|
Merge tag 'OB_14.3.1-28m' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/MonitorAreaUtils.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
rpms/awips2.core/Installer.gfe.climo/component.spec
Former-commit-id: 353674cd0deec2dd86c38dc75c7593d1477a7e78
|
2014-10-28 13:32:31 -05:00 |
|
Rici.Yu
|
45e3b2895b
|
ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility
Change-Id: Ia377d571db68d0078399460ad1d434ba4dad510b
Former-commit-id: 902d1b1e4fed90ff216eab2ee5fc3f198bf7fc6d
|
2014-10-24 10:54:37 -04:00 |
|
Ron Anderson
|
e729cd8814
|
Omaha #3685 Add support for sending specific products in mixed case
Change-Id: I3c7e8bfe285ce7344ddfccf28173a68f3396b126
Former-commit-id: 18d4fc13ebbd77b3a476bc70252fae1322d631c6
|
2014-10-22 14:29:30 -05:00 |
|
Ana Rivera
|
c245f3a3c4
|
VLab Issue #5034 - Ingest and Display NWPS model data; fixes #5034
Change-Id: I836ffda083281073f5cf1d20de79f73091d49426
Former-commit-id: a72135fc85a602b67b929b6870edbaabf4dc8fc1
|
2014-10-22 17:03:07 +00:00 |
|
Rici.Yu
|
9c2555466c
|
ASM #16858 - Check in SerpISC tool.
Change-Id: I4c15360c377370bd757ed2eaad7aeade49412fd6
Former-commit-id: 1e8961e4f4a8168b667ce4b689efd88157dfb61c
|
2014-10-20 14:39:46 -04:00 |
|
Sarah Pontius
|
8be0082cc2
|
VLab Issue #5012 - HLS/TCV files for OPG Oct-15-2014; fixes #5012
Change-Id: Iacf701775c343077102647136272c92d08776caa
Former-commit-id: c7b2c66316ccca08b56fe9ece8f8a24ec260207b
|
2014-10-15 10:15:30 -06:00 |
|
Sarah Pontius
|
2a96302bfb
|
VLab Issue #5001 - HLS/TCV files for OPG Oct-2014; fixes #5001
Change-Id: I4018168e958a75ff7db3dd6cfd88a4ac17947981
Former-commit-id: b7ccb5162f481e81dc50fcf63b200ab06a959cb8
|
2014-10-14 12:04:50 -06:00 |
|
Steve Harris
|
39c5e9c314
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: df9ef1f664e14fa7843328338c5b234022f4bfd4
|
2014-10-06 13:57:59 -05:00 |
|
Brian.Dyke
|
f47840e4d9
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: ece734cb6218a80fa2dda1b3c43673dc5a31bfbb
|
2014-10-02 10:24:04 -04:00 |
|
Steve Harris
|
90e08b96e1
|
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
|
2014-09-29 12:58:56 -05:00 |
|
Ana Rivera
|
535f254357
|
VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297
Former-commit-id: 2c16492202230dcbec93cf390b47f400a77a545e
|
2014-09-24 20:11:29 +00:00 |
|