Steve Harris
|
b78afa0e72
|
Merge tag 'OB_14.4.1-24' into omaha_14.4.1
14.4.4-24
Former-commit-id: 11b32bb99084a6162cd0d463800281c7115aef85
|
2015-04-13 08:56:12 -05:00 |
|
Steve Harris
|
6aa72398d2
|
Omaha #3299 - Master rights and foss for 14.4.1
Former-commit-id: e9c9daec3e77c8f9af54afb06318f0dce9958b50
|
2015-04-09 10:22:32 -05:00 |
|
Fay.Liang
|
dd7c47b911
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: f8b4d9d81247c6089960c83b57417a5ba62cdfc2
|
2015-03-27 15:16:09 -04:00 |
|
Fay.Liang
|
f3dcf799d6
|
Merge tag 'OB_14.3.2-24m' into master_14.4.1
14.3.2-24m
Conflicts:
rpms/awips2.core/Installer.gfesuite-server/component.spec
Former-commit-id: a91ad7ff32c153c34d6982f29cc497812d9f22f7
|
2015-03-27 15:07:28 -04:00 |
|
Sean.Webb
|
6679bc9519
|
Merge "ASM #17221 - Updated LDM to 6.12.9" into asm_14.4.1
Former-commit-id: ec7696a5ca44ccdebf86888d27e3fcb151576a61
|
2015-03-27 08:06:00 -05:00 |
|
Sean.Webb
|
723febe25e
|
ASM #17221 - Updated LDM to 6.12.9
Change-Id: Ib01372e3d0365404c9c8c94b951536d671ec5319
Former-commit-id: 3fb2bed462ec0cb2f985b80a4ea02192eac917db
|
2015-03-27 07:58:40 -04:00 |
|
Fay.Liang
|
475019fb61
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: e926e1c0160e7d40df41fbe1e6ec7dd7263ade3e
|
2015-03-18 15:12:56 -04:00 |
|
Fay.Liang
|
3233640aa2
|
Merge ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 42d435f739134ec29a021415ed96b6c3406fc021
|
2015-03-18 14:54:46 -04:00 |
|
Sean.Webb
|
506090817b
|
ASM #17181 - Updated pqact.conf.template for MRMS, HRRR and ESTOFS
Change-Id: Ifd691a453dd201c04a297aa54068a9557b1b03e6
Former-commit-id: f3164dc891d77c84d12e745a7ece5bd7eddfa0ee
|
2015-03-17 11:31:56 -04:00 |
|
Fay.Liang
|
8bdfffa97d
|
Merge branch 'asm_14.3.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.2
Former-commit-id: f7d4e763a667aef949d360d18143f8caa618ae6b
|
2015-03-12 22:23:33 -04:00 |
|
Shawn.Hooper
|
713e1be2c2
|
ASM #17164 - Update gfesuite build files
Change-Id: I3f350beb10e2cb4b49d9f755e6cd9c549f1c95a4
Former-commit-id: 446c28f031dd408cea1f79c093d9239e47af0798
|
2015-03-12 17:14:33 -04:00 |
|
Fay.Liang
|
70714494f9
|
Merge tag 'OB_14.3.2-21m' into master_14.4.1
14.3.2-21m
Former-commit-id: f08ea9cd7acadd1f8f1bb2eedf7ce39894c3f39e
|
2015-03-11 14:32:22 -04:00 |
|
Fay.Liang
|
d06537cf12
|
Merge branch 'master_14.3.1.1' into master_14.3.2
Former-commit-id: 450fdfceca0e7f3745a8dcbffe3d7740ff1aee64
|
2015-03-10 14:52:49 -04:00 |
|
Sean.Webb
|
4ef6100cf8
|
ASM #17227 - Fixed total lightning pattern
Change-Id: I889a405685e1b51cb115d40ada425f80947920d2
Former-commit-id: 4349757b615d3963d3201c1045fa7599c09acdf8
|
2015-03-10 12:43:15 -04:00 |
|
Fay.Liang
|
0e475cb704
|
Merge tag 'OB_14.3.2-19m' into master_14.4.1
14.3.2-19m
Conflicts:
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 4b3626307cf35ada45985c25cf062e7b857db764
|
2015-03-09 16:11:13 -04:00 |
|
Greg Armendariz
|
d49207c051
|
Omaha #4200 - Update Shapely to v1.4.4
Former-commit-id: c5b543725c87e17d4899f66f5f2b1ea76a4c5ac9
|
2015-03-03 16:05:47 -06:00 |
|
David Friedman
|
1afdea35fb
|
ASM #14990 - Add pqact patterns for earthquake and tsunami products
Change-Id: Ied72bd5896a9e1939f4ddd9d68cb362067406d65
Former-commit-id: 899c6472abfdcfa27018d20cc204735dea4d2f43
|
2015-02-24 15:33:48 +00:00 |
|
Fay.Liang
|
31dcfdc402
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: ef870235658ea88d676ca65611bcfbdd56d206b1
|
2015-02-17 14:07:11 -05:00 |
|
Sean.Webb
|
edae59425b
|
ASM #17142 - Fixed nwps dir permissions
Change-id: Ibd843098cea02d3f1ea6b75d3e715d804c5c1e37
Former-commit-id: fc7258495581cd1d241f55aba2a8e60053575571
|
2015-02-17 12:29:55 -05:00 |
|
Fay.Liang
|
af8b95bb97
|
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Former-commit-id: fd4e0b9ada38ab93586088948809279e39a0374c
|
2015-02-13 09:34:24 -05:00 |
|
Fay.Liang
|
eefa05ada3
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 480b6597331ebd2ce7d7835de6e21050abf18722
|
2015-02-13 09:32:40 -05:00 |
|
Shawn.Hooper
|
9c637bda0b
|
ASM #15083 - Updates to allow nwps to be released in the gfesuite-server rpm
Change-Id: I9ab3fca601120954ebe229d3a4f0871b7b43af28
Former-commit-id: 2c62f45654b0531349fef5e7523c67c94236ce1a
|
2015-02-12 17:32:05 -05:00 |
|
Ana Rivera
|
6191c93a9c
|
Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Change-Id: I1d6fac5acc7e468e2ff5f79869201018d849d209
Former-commit-id: f6b3765fc1670db2b9ceef75be7422a07b2badcf
|
2015-02-11 22:00:40 +00:00 |
|
Steve Harris
|
9311e6f440
|
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 |
|
Steve Harris
|
a5da551a5d
|
Omaha #4111 - Updated foss licenses and Master_Rights_File.pdf
Former-commit-id: 45e09e8f848d85ae45205b655074bba8342c9156
|
2015-02-11 10:58:07 -06:00 |
|
Fay.Liang
|
07076f91aa
|
Merge branch 'master_14.3.1' into master_14.3.2
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 155801c3d418b6deb7e17ffb04c963a80d092c5a
|
2015-02-10 10:59:16 -05:00 |
|
Ana Rivera
|
c2f02ff4b2
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f
Former-commit-id: c6eb72ac05824e0eb7aad7c5ae1a7a0ee54e3265
|
2015-02-10 14:41:19 +00:00 |
|
Fay.Liang
|
43c7161dcf
|
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
|
af72fd3775
|
Omaha #3299 - Fix collaboration RPM build issue
Former-commit-id: 9132eff524289c5df48c682cd3ff226fe14cdf1b
|
2015-02-06 11:37:47 -06:00 |
|
Joshua Watson
|
65a568b79d
|
VLab Issue #5238 - serverConfig.py - changed parmsGFSLAMPGrid to GFSLAMPGridPARMS, changed serverConfig.Vis to Vis on that same line. pqact.conf.template - fixed typo on line 223 FLE to FILE, line 286 missing a period in pattern; fixes #5238
Change-Id: Ia83e3576613683fa58a7631150d2d3132937a7b4
Former-commit-id: 12e0aeea9fa6b2dc7de297aee0ff7d1de3a99111
|
2015-02-05 09:26:20 -05:00 |
|
Shawn.Hooper
|
915ddd6964
|
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 |
|
Greg Armendariz
|
bb8a61a996
|
Omaha #3839 - Add script to /awips2/edex/bin/
Former-commit-id: c215890342be6fed80d614e0a5853e8ce816a7f2
|
2015-02-04 09:59:06 -06:00 |
|
Roger Ferrel
|
6e4b93ed15
|
Issue #4066 Added Earth Networks Total Lightning to pqact.template and RAW_DATA.xml
Change-Id: I09ccfea7e02134339771550fb915bb3516067320
Former-commit-id: 4d9df40733b0ac8cfa40974dd13abe2e204ab3bd
|
2015-02-03 11:58:13 -06:00 |
|
Greg Armendariz
|
e004e0881f
|
Merge "Omaha #4065 - Update EDEX RPM install to modify date stamp" into omaha_14.4.1
Former-commit-id: ddf9b7d0a97ffda6e79688d7c35c828fb7fc1d91
|
2015-02-03 11:35:26 -06:00 |
|
Greg Armendariz
|
fbadd1deb1
|
Omaha #4065 - Update EDEX RPM install to modify date stamp
Change-Id: I425408d1d038194207469f187be74f8c88f5d3c0
Former-commit-id: 83243af002e8ddfd15f899ff1ab3e511cf5a0af4
|
2015-02-03 10:12:54 -06: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 |
|
Steve Harris
|
0f05c53a53
|
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 |
|
David Lovely
|
cf4077e8cd
|
Omaha #3957 Removed trailing slash in Spec for QPID.
Change-Id: Ief731b9e13701c19cd11bc383b1336e53d6174f5
Former-commit-id: 5fe598aef48f91e57d8f233872ccd0bab395164e
|
2015-01-15 08:16:18 -06:00 |
|
David Lovely
|
0b7ee2dc08
|
Omaha #3957 Fixed path in Installer.edex-environment for QPID.
Change-Id: I846d0793c646a2e6321ed74ab672f70407ff13ac
Former-commit-id: 8107830bf2fa384c3bbe9472801c89a2a43990a3
|
2015-01-14 14:40:36 -06:00 |
|
David Lovely
|
f75230366c
|
Omaha #3957 Fixed path in Installer.edex-environment for QPID.
Change-Id: I22eea04180974e6d3cbcfb4fc4a2e18fe7823db9
Former-commit-id: 34faf643b5de3c01713e0129209efb4ccc2c2aa0
|
2015-01-14 11:28:56 -06: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 |
|
David Lovely
|
e56002debf
|
Omaha #3957 Moved QPID to build repository directory structure.
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084
Former-commit-id: f27b0c6b92b4c744493e44b510defe3d650ca1f6
|
2015-01-07 12:03:10 -06:00 |
|
Fay.Liang
|
77863309a9
|
Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 0edb5ba1c9cad9e2933ab86d57ec5e4f355d244d
|
2014-12-22 14:43:32 -05:00 |
|
Qinglu.Lin
|
baa96590f1
|
ASM #637 - Create a base level map bundle for the WarnGenLoc shape file
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25
Former-commit-id: 06fdefbc5b528ddfb0bb8baddd85fe75e4d07864
|
2014-12-17 16:53:31 -05:00 |
|
Brian Clements
|
6ae64007a2
|
Issue #3935 prevent warning when using init.d script to stop edex
Change-Id: I61d4ed16e76b38d69e2a71549ce31035f4837b03
Former-commit-id: b1034aa16b3393e6584038ebb80faf2a4e1a831f
|
2014-12-17 14:35:16 -06: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 |
|
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 |
|