Fay.Liang
|
de502a310b
|
Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 8f839ec64da04492e6cf109fdf47b95f08db5388
|
2015-02-03 16:04:56 -05:00 |
|
Zhidong.Hao
|
6ab746f74a
|
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 |
|
Ana Rivera
|
20ad0a65f3
|
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 |
|
Ana Rivera
|
327945af8b
|
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 |
|
Ana Rivera
|
7c25945fd9
|
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 |
|
Fay.Liang
|
a09a27a963
|
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 |
|
Fay.Liang
|
eed6737801
|
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 |
|
Michael Gamazaychikov
|
e007fac30f
|
ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
Change-Id: Ife5ecb2c5823d4d34c1b4af6dc53fa360074b7bb
Former-commit-id: 38eabd6196df1576970019f2b0255d3f39a825a9
|
2015-01-09 15:07:29 -05:00 |
|
Ying-Lian.Shi
|
c99e199a69
|
ASM #15035 - Add SFMG WNJ GFE Domain definition to baseline serverConfig, double quote to sigle quote
Change-Id: I9c652fdc3440d8c15a0c443a6b80a8a10877693e
Former-commit-id: af67fa0f955b35c7b9b141fef507a5db805eaa27
|
2015-01-08 15:28:54 +00:00 |
|
Joshua Watson
|
5aa4748569
|
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29
|
2014-12-17 08:38:27 -05:00 |
|
Ana Rivera
|
1823ed3596
|
Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129, #5421, #5345.
Conflicts:
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
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: Ic838b8b0499b1022a555915c7264b414d6948895
Former-commit-id: 111ae763e6becb944e34e262e1d87d2d344236e4
|
2014-12-16 23:39:02 +00:00 |
|
Zhidong.Hao
|
c3b623cb6d
|
ASM #647 GFE: Files not getting purged out of /awips2/GFESuite/products/ISC
Change-Id: I656058629e2982a20312fca7f7024db82a8ad2fb
Former-commit-id: 133d3f229145c8ac84f31a8a6becc98688d189ae
|
2014-12-16 10:16:35 -05:00 |
|
Richard Peter
|
8de1ebcb65
|
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 |
|
Joshua Watson
|
bca4b40eed
|
VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840
Former-commit-id: cfce2a5f633a7312b9ad64dafb559c834b0ceddf
|
2014-12-11 11:39:00 -05:00 |
|
Roger Ferrel
|
597fdb8280
|
Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region.
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a
Former-commit-id: 46d3bbcc99d93845dcb159012b872fe746756b7c
|
2014-12-04 12:52:22 -06:00 |
|
Fay.Liang
|
f5095bed4e
|
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 |
|
Fay.Liang
|
19194e0aa3
|
Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 1fcac564095b86cd4c6103a6484b25bbff2339b2
|
2014-12-04 13:46:31 -05:00 |
|
Bruce.Hundermark
|
f89ff6da89
|
ASM #631 - GFE: smartInit file baseline error with LAPS sky cover
Change-Id: Ice58a2e695e91efacb4adb39d47af50dd7bb6d78
Former-commit-id: de639a90c9858e2d85ccfbbc7dba8bee6c0380be
|
2014-12-04 16:46:09 +00:00 |
|
Sarah Pontius
|
5d696b412d
|
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 |
|
Ron Anderson
|
ebeb4440ef
|
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
|
fe5bfbaa73
|
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
|
5abf37ea62
|
VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
This reverts commit f1f5f2c717 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1].
Change-Id: I631bb1722abea96e08967a8d9fa9f175a886f685
Former-commit-id: 373acfce57d5e0044f13382b926cb2fc1f830e54
|
2014-12-02 13:43:03 +00:00 |
|
Ying-Lian.Shi
|
7c99c63441
|
ASM #98 GFE: ifpnetCDF no longer gives an error code in some cases
Change-Id: I74e78b7d64fef4538ded4ed0e4e4b13d1950363a
Former-commit-id: 98c99131445b4b9fa727a9ea09fc4df8906aa90b
|
2014-11-21 15:38:25 +00:00 |
|
Ana Rivera
|
1999049d90
|
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 |
|
Fay.Liang
|
45b80432d6
|
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 |
|
Ron Anderson
|
9104023408
|
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 |
|
Fay.Liang
|
8ced3a4c73
|
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
|
e54f3305d8
|
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
|
cfe2f18790
|
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
|
fe531a33e5
|
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
|
4bef6cf18d
|
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
|
061583cd50
|
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 |
|
Steve Harris
|
9de825c332
|
Merge tag 'OB_14.3.1-32m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/build.edex/esb/conf/logback-ingest.xml
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
Former-commit-id: 565efec2ebe5a3a1a009d213a77617f4a593aa6b
|
2014-11-10 08:42:01 -06:00 |
|
Brian.Dyke
|
acf00264f4
|
Merge branch 'master_14.2.4' into master_14.3.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 5c2079dd25181c68f872691e81842aff0f696f8d
|
2014-11-06 12:55:21 -05:00 |
|
Shawn.Hooper
|
ec3b831987
|
ASM #16800 - Add HRRR under D2D in Weather Element Browser
Change-Id: I829cd7357ccd37e389e88567a4159d0efde9aa41
Former-commit-id: 99807ddc4810c08635d5462357dc29e661686e33
|
2014-10-30 14:47:26 -04:00 |
|
Brian.Dyke
|
01c3167dc9
|
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
|
760c0d6532
|
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 |
|
Ron Anderson
|
9bd76e678f
|
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
|
19527f50bb
|
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 |
|
Ron Anderson
|
8362946f0e
|
Issue #3766 Fixed return type of GridParmManager.createNewDb
Change-Id: Ib76bf614b09895ef08065da86d3af8d59f490f4c
Former-commit-id: 2e2f83952a6ef00b17d9f4504133c85e93e0126e
|
2014-10-27 18:40:15 -05:00 |
|
Ron Anderson
|
5d07d13aa0
|
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
|
f1f5f2c717
|
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 |
|
Steve Harris
|
bfade7674d
|
Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
Former-commit-id: ea787b645974850607658e5a7dfc4a072d831a3b
|
2014-10-22 11:45:39 -05:00 |
|
Richard Peter
|
2c21e72bf3
|
Merge "Omaha #3454 Upgrading to Hibernate 4.2.15" into omaha_14.4.1
Former-commit-id: 6b2879d8180a6b6f60a340977e3254ee5eb95213
|
2014-10-21 10:51:56 -05:00 |
|
Shawn.Hooper
|
ddeec493c3
|
ASM #13467 - Update GenericHazards.py for Shannon
Change-Id: Ic1131929aa14f97cff0e1cf92e30c338470f368e
Former-commit-id: f4e8f7493bbfb025e8040f7663dc582414a87413
|
2014-10-21 11:11:34 -04:00 |
|
Benjamin Phillippe
|
fdd16051e8
|
Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29
Former-commit-id: 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5
|
2014-10-20 12:42:19 -05:00 |
|
Ron Anderson
|
2781c4369b
|
Omaha #3685 Checkin original A1 files sorted by key to aid in comparison with new files.
Former-commit-id: 09e39d4f85c8e853475b9f6059a748291e4d1bd7
|
2014-10-16 18:32:04 -05:00 |
|
Shawn.Hooper
|
118f34bbf1
|
ASM #13467 - Fix for GFE: Need to add Beach Hazards Statement
Change-Id: I9d19a76afff8e4c36db20aec15b997eefc260209
Former-commit-id: 366c7c478c6d83f8d21e3b30cc664a32cabf08bd
|
2014-10-16 11:30:29 -04:00 |
|
Sarah Pontius
|
cdb47ed221
|
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 |
|
Steve Harris
|
f2fdf98d2f
|
Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: 4be51191bc64978e3c455702bede3456666fbffe
|
2014-10-15 08:42:02 -05:00 |
|