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 |
|
Ying-Lian.Shi
|
3e1d1aa814
|
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 |
|
Zhidong.Hao
|
e443ced7f1
|
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
|
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 |
|
Roger Ferrel
|
462e0d85c0
|
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
|
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 |
|
Fay.Liang
|
83a4987188
|
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
|
e1e453138f
|
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
|
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 |
|
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 |
|
Ying-Lian.Shi
|
a0bfede4e0
|
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 |
|
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 |
|
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 |
|
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 |
|
Steve Harris
|
a16abe1b8b
|
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
|
aae68215c8
|
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
|
a44d775a27
|
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
|
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 |
|
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 |
|
Ron Anderson
|
ebe43e22d3
|
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
|
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 |
|
Steve Harris
|
dc557b2d0c
|
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
|
05784292b7
|
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
|
4d81023184
|
ASM #13467 - Update GenericHazards.py for Shannon
Change-Id: Ic1131929aa14f97cff0e1cf92e30c338470f368e
Former-commit-id: f4e8f7493bbfb025e8040f7663dc582414a87413
|
2014-10-21 11:11:34 -04:00 |
|
Benjamin Phillippe
|
7845e8e40f
|
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
|
2fbf61748d
|
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
|
eafaf01966
|
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
|
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 |
|
Steve Harris
|
aff75d954b
|
Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: 4be51191bc64978e3c455702bede3456666fbffe
|
2014-10-15 08:42:02 -05: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 |
|
Shawn.Hooper
|
cea5061c61
|
ASM #13467 - GFE: Need to add Beach Hazards Statement
Change-Id: Icd52e8f1cd05f1f1ecd0b43458593e95496e0db6
Former-commit-id: 457c467d7437c5550bb8727e813d8aa9d9c338a9
|
2014-10-10 13:14:25 -04:00 |
|
Ron Anderson
|
c7bf818989
|
Issue #3684 Fix GFE notification sending
Change-Id: I3b2ab7f454cb9454a9827ef994002d1b2348f462
Former-commit-id: b538cd55c0662d3d593522817986109c7e03625a
|
2014-10-09 09:21:29 -05:00 |
|
Ron Anderson
|
4d0c1b3151
|
Issue #3684 Fix NPE in GridParmManager
Change-Id: I9b40e8cbf0032ca531723ff782b77e1ac9750c84
Former-commit-id: bcc256c7c4a737a822ac30d0de8d3378818917da
|
2014-10-08 18:39:56 -05:00 |
|
Ron Anderson
|
4a1a3aef82
|
Issue #3684 Fix some issues found after #3684 with certain GFE configurations
Change-Id: I92b45588d9d4fe9169708c07119767017426d468
Former-commit-id: 6dc55b51414414aa416c9ad0c688d1d34ba08c17
|
2014-10-08 18:05:27 -05:00 |
|
Ron Anderson
|
be856e2981
|
VLab Issue #4953 Refactored TPCWatchSrv to support TCV effort.
Change-Id: I8a5c5c7fa62235fdc6fa4d90e82ff2711e724a15
Former-commit-id: 9a2a6989687c749ee87291506a7ee44a6cd7e737
|
2014-10-08 11:51:00 -05:00 |
|
Ron Anderson
|
34eafba2da
|
Issue #3684 Additional changes to keep IFPServers better synchronized
Change-Id: Ibb1f28d07a5792d4f23eb3232b75099b259a7064
Former-commit-id: 8a8f82e5916d4a71fa639eb16057e2c68276ecff
|
2014-10-07 11:51:39 -05: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 |
|
Richard Peter
|
5a0dc20480
|
Omaha #3300 Fix merge of 14.3.1-23
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9
Former-commit-id: 075f3f69cbf19d298398cb7c481668b97d4dad5d
|
2014-10-03 14:14:16 -05:00 |
|
Steve Harris
|
da463c484e
|
Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
Issue #3648:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Issue #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
Also modified with the resolution of #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java
Former-commit-id: 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd
|
2014-10-03 10:18:34 -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 |
|
dmsys
|
8c3625cfec
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c
|
2014-09-30 13:45:54 -04:00 |
|
Ron Anderson
|
ec910127b6
|
Omaha #3300 Merge #3661 and #3670 changes into 14.4.1 from 14.3.1_backports
Change-Id: I2be578791e61964c3e2fd6b2d810ef492056b69c
Former-commit-id: 525cffa1ec2a999d97a5fc3ca2153c8241c534be
|
2014-09-30 08:44:01 -05:00 |
|
Brian.Dyke
|
0a497fc015
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 01cb1dc674ae1249d97dc10be5c068de0ed2a222
|
2014-09-29 11:20:57 -04:00 |
|