mjames-upc
|
886cd5940f
|
Additions and deletions - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: 7eacf4dc1c
|
2015-01-12 14:02:58 -07: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 |
|
Fay.Liang
|
bccf70f0bd
|
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: 19a29da5de [formerly 6b77894bd0] [formerly c6bd5d7675] [formerly 19a29da5de [formerly 6b77894bd0] [formerly c6bd5d7675] [formerly eed6737801 [formerly c6bd5d7675 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]]
Former-commit-id: eed6737801
Former-commit-id: 23ba9f4154 [formerly f3ecae8573] [formerly 69382d354f0cba941ad1b60d73cca2d121eb949e [formerly 5cc8e5b4af]]
Former-commit-id: cd3c370873d18a2ca3801fd2f83aa4f8b35fe06e [formerly 06ac6b396e]
Former-commit-id: 1e9024ede9
|
2015-01-12 13:03:31 -05:00 |
|
Fay.Liang
|
19a29da5de
|
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: eed6737801 [formerly c6bd5d7675 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]
Former-commit-id: c6bd5d7675
Former-commit-id: 6b77894bd0
|
2015-01-12 13:03:31 -05:00 |
|
mjames-upc
|
1327508f9f
|
build 14.2.1-19n2
Former-commit-id: 943fb05022
|
2015-01-10 10:58:48 -07:00 |
|
mjames-upc
|
6055fb6c50
|
ldm pqact update and fix for setting hostname post-install
Former-commit-id: b343262a85
|
2015-01-10 09:57:04 -07:00 |
|
mjames-upc
|
e29a717f80
|
moved awips2-edex-shapefiles RPM build to separate script, reduce time to run buildEDEX by 20 minutes
Former-commit-id: 38b0e2e9dd
|
2015-01-08 17:08:33 -07:00 |
|
David Lovely
|
240927c241
|
Omaha #3957 Moved QPID to build repository directory structure.
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084
Former-commit-id: f27b0c6b92b4c744493e44b510defe3d650ca1f6
|
2015-01-07 12:03:10 -06:00 |
|
David Lovely
|
0dba443423
|
Omaha #3957 Moved QPID to build repository directory structure.
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084
Former-commit-id: d25fcc9155 [formerly 208dd5de01] [formerly 240927c241] [formerly d25fcc9155 [formerly 208dd5de01] [formerly 240927c241] [formerly e56002debf [formerly 240927c241 [formerly f27b0c6b92b4c744493e44b510defe3d650ca1f6]]]]
Former-commit-id: e56002debf
Former-commit-id: cc40ff8301 [formerly 9f09af1c8a] [formerly b42af842cf64f96a786847d263d90f2eab6ef2ca [formerly d860af2218]]
Former-commit-id: ba931f8d29a5e299b40d1de07af37d22f7100e4b [formerly b67b97803c]
Former-commit-id: 9c401ce4ea
|
2015-01-07 12:03:10 -06:00 |
|
David Lovely
|
d25fcc9155
|
Omaha #3957 Moved QPID to build repository directory structure.
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084
Former-commit-id: e56002debf [formerly 240927c241 [formerly f27b0c6b92b4c744493e44b510defe3d650ca1f6]]
Former-commit-id: 240927c241
Former-commit-id: 208dd5de01
|
2015-01-07 12:03:10 -06:00 |
|
mjames-upc
|
6e59ce3a8f
|
remove chkconfig from edex service manager
Former-commit-id: 4072c212a7
|
2015-01-05 15:22:13 -07:00 |
|
mjames-upc
|
10ffa5cf2c
|
NCP updates: new ncuair levels attribute files, UNIWISC SOUNDER composites grouped w ARCTIC/ANTARCTIC composites, FAROP and NCODA renaming, FAROP aerosol optical depth attribute file added, pqact.conf restore UNIWISC composites
Former-commit-id: fa945602a6
|
2015-01-03 14:03:01 -07:00 |
|
mjames-upc
|
af37bea025
|
LDM RPM build post install file edits. build version and CAVE IDE max memory increase
Former-commit-id: e260556e9b
|
2015-01-03 13:51:19 -07:00 |
|
mjames-upc
|
48790f42b7
|
CMC NCP resource definition + HRRR disabled in pqact.conf + fix for hostname defnition in awips2-ldm RPM post install
Former-commit-id: 11f3354e0a
|
2014-12-30 15:58:46 -07:00 |
|
mjames-upc
|
b50e95b077
|
CMC, FNMOC, NAM-5km, NAM-32km, NAM243 grid support added/updated
Former-commit-id: 042a601d8a
|
2014-12-29 15:32:20 -07:00 |
|
Fay.Liang
|
06061eee19
|
Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 0edb5ba1c9cad9e2933ab86d57ec5e4f355d244d
|
2014-12-22 14:43:32 -05:00 |
|
Fay.Liang
|
f550c8a8cd
|
Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 77863309a9 [formerly 06061eee19 [formerly 0edb5ba1c9cad9e2933ab86d57ec5e4f355d244d]]
Former-commit-id: 06061eee19
Former-commit-id: 795b472fff
|
2014-12-22 14:43:32 -05:00 |
|
Fay.Liang
|
187e198d21
|
Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: f550c8a8cd [formerly 795b472fff] [formerly 06061eee19] [formerly f550c8a8cd [formerly 795b472fff] [formerly 06061eee19] [formerly 77863309a9 [formerly 06061eee19 [formerly 0edb5ba1c9cad9e2933ab86d57ec5e4f355d244d]]]]
Former-commit-id: 77863309a9
Former-commit-id: fc78eefa8b [formerly b4051b9fe8] [formerly fb1b91e6a33c12d0935211fb3d5bc6d4e6993ab8 [formerly 22fc1baada]]
Former-commit-id: 3adba1094bd386fd5894e9d1f26ac4b048343b28 [formerly 7839f80035]
Former-commit-id: 155d0783d2
|
2014-12-22 14:43:32 -05:00 |
|
Qinglu.Lin
|
3b3780fd13
|
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 |
|
Qinglu.Lin
|
25a8e87b9a
|
ASM #637 - Create a base level map bundle for the WarnGenLoc shape file
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25
Former-commit-id: 0eb9f8c722 [formerly 2d4a045e3c] [formerly 3b3780fd13] [formerly 0eb9f8c722 [formerly 2d4a045e3c] [formerly 3b3780fd13] [formerly baa96590f1 [formerly 3b3780fd13 [formerly 06fdefbc5b528ddfb0bb8baddd85fe75e4d07864]]]]
Former-commit-id: baa96590f1
Former-commit-id: 7cb4e6f236 [formerly f4d78ec480] [formerly e082c3f2b32d5b0433ad38471f77919246f7c6de [formerly cae57983d8]]
Former-commit-id: 4fbfef3fc4d60690cb1aef306d0edd2b56c0a916 [formerly 484799b7f5]
Former-commit-id: 4caef3c695
|
2014-12-17 16:53:31 -05:00 |
|
Qinglu.Lin
|
0eb9f8c722
|
ASM #637 - Create a base level map bundle for the WarnGenLoc shape file
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25
Former-commit-id: baa96590f1 [formerly 3b3780fd13 [formerly 06fdefbc5b528ddfb0bb8baddd85fe75e4d07864]]
Former-commit-id: 3b3780fd13
Former-commit-id: 2d4a045e3c
|
2014-12-17 16:53:31 -05:00 |
|
Brian Clements
|
d2774cffc2
|
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 |
|
Brian Clements
|
80c720eac0
|
Issue #3935 prevent warning when using init.d script to stop edex
Change-Id: I61d4ed16e76b38d69e2a71549ce31035f4837b03
Former-commit-id: 6ae64007a2 [formerly d2774cffc2 [formerly b1034aa16b3393e6584038ebb80faf2a4e1a831f]]
Former-commit-id: d2774cffc2
Former-commit-id: 06d82c9f4e
|
2014-12-17 14:35:16 -06:00 |
|
Brian Clements
|
f2481c2d2f
|
Issue #3935 prevent warning when using init.d script to stop edex
Change-Id: I61d4ed16e76b38d69e2a71549ce31035f4837b03
Former-commit-id: 80c720eac0 [formerly 06d82c9f4e] [formerly d2774cffc2] [formerly 80c720eac0 [formerly 06d82c9f4e] [formerly d2774cffc2] [formerly 6ae64007a2 [formerly d2774cffc2 [formerly b1034aa16b3393e6584038ebb80faf2a4e1a831f]]]]
Former-commit-id: 6ae64007a2
Former-commit-id: 4aa9120753 [formerly 14a6f678ca] [formerly 6e21ec9f0b987e4baff0d440cd2b78bd4c23bf29 [formerly 53f28e0b75]]
Former-commit-id: ec5ee06886fb47fbf4cb2864824b6adf3499a07f [formerly db5e0013a8]
Former-commit-id: 6794196b7c
|
2014-12-17 14:35:16 -06:00 |
|
Joshua Watson
|
3f2f7f2f3a
|
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 |
|
Joshua Watson
|
cf1882cc44
|
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: 5aa4748569 [formerly 3f2f7f2f3a [formerly 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29]]
Former-commit-id: 3f2f7f2f3a
Former-commit-id: 0c375981e7
|
2014-12-17 08:38:27 -05:00 |
|
Joshua Watson
|
ef7dbe8735
|
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: cf1882cc44 [formerly 0c375981e7] [formerly 3f2f7f2f3a] [formerly cf1882cc44 [formerly 0c375981e7] [formerly 3f2f7f2f3a] [formerly 5aa4748569 [formerly 3f2f7f2f3a [formerly 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29]]]]
Former-commit-id: 5aa4748569
Former-commit-id: e419cebdea [formerly 1040be8594] [formerly acf20dd93b57335f5216ef543b921227c78af2eb [formerly 094e8048e9]]
Former-commit-id: 7dccfd850e0304ac1124ea5b96ef03ed520b2f03 [formerly eb68dac32d]
Former-commit-id: 8dd62191ae
|
2014-12-17 08:38:27 -05:00 |
|
Ana Rivera
|
043bc3a8b7
|
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 |
|
Ana Rivera
|
1f5dd0c92b
|
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: 1823ed3596 [formerly 043bc3a8b7 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]
Former-commit-id: 043bc3a8b7
Former-commit-id: 214be0a93b
|
2014-12-16 23:39:02 +00:00 |
|
Ana Rivera
|
769df60be8
|
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: 1f5dd0c92b [formerly 214be0a93b] [formerly 043bc3a8b7] [formerly 1f5dd0c92b [formerly 214be0a93b] [formerly 043bc3a8b7] [formerly 1823ed3596 [formerly 043bc3a8b7 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]]]
Former-commit-id: 1823ed3596
Former-commit-id: 90efb445f0 [formerly ef35771bfa] [formerly df1f34b8c00ffdaeec21c1d4b59bdc4ae9648cb2 [formerly d2d8127363]]
Former-commit-id: d7532e0824a0a0330656fbdab24737f609c2a10f [formerly f7c0319ee4]
Former-commit-id: 40df82b005
|
2014-12-16 23:39:02 +00: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 |
|
Richard Peter
|
7434f3c20e
|
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: 20fa07c6d3 [formerly 23eafaba3d] [formerly 2457d0e6f7] [formerly 20fa07c6d3 [formerly 23eafaba3d] [formerly 2457d0e6f7] [formerly 8de1ebcb65 [formerly 2457d0e6f7 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]]]
Former-commit-id: 8de1ebcb65
Former-commit-id: 9c162858f4 [formerly 746bbb0885] [formerly 2a8f875c3a3a12752593d61bb77d88a0341b5368 [formerly f7d8755ba9]]
Former-commit-id: 0fc5096e00ed840082ba093d3d160ad0e811a828 [formerly bf3ddbb62b]
Former-commit-id: 59e9fe78f2
|
2014-12-12 10:36:04 -06:00 |
|
Richard Peter
|
20fa07c6d3
|
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: 8de1ebcb65 [formerly 2457d0e6f7 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]
Former-commit-id: 2457d0e6f7
Former-commit-id: 23eafaba3d
|
2014-12-12 10:36:04 -06:00 |
|
Joshua Watson
|
a8f5bb480b
|
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 |
|
Joshua Watson
|
0d02d676b4
|
VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840
Former-commit-id: bca4b40eed [formerly a8f5bb480b [formerly cfce2a5f633a7312b9ad64dafb559c834b0ceddf]]
Former-commit-id: a8f5bb480b
Former-commit-id: 0c8b629c96
|
2014-12-11 11:39:00 -05:00 |
|
Joshua Watson
|
b423dc7745
|
VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840
Former-commit-id: 0d02d676b4 [formerly 0c8b629c96] [formerly a8f5bb480b] [formerly 0d02d676b4 [formerly 0c8b629c96] [formerly a8f5bb480b] [formerly bca4b40eed [formerly a8f5bb480b [formerly cfce2a5f633a7312b9ad64dafb559c834b0ceddf]]]]
Former-commit-id: bca4b40eed
Former-commit-id: 1c99832ab2 [formerly ce1476d78f] [formerly ddff465e08a2a953e3178779f582e8f0d1f8ea23 [formerly 9383635749]]
Former-commit-id: 2a340305564d3a45aecb6fbfe0c24d468ebd50cc [formerly 33e4b8bc88]
Former-commit-id: 8789ca8e8e
|
2014-12-11 11:39:00 -05:00 |
|
Bryan Kowal
|
aad5e554b9
|
Omaha #3914 - increment yajsw release
Former-commit-id: 9a3e3a2cfdc29926e2d08c7a8e33d45f9ce5f22a
|
2014-12-10 10:34:26 -06:00 |
|
Bryan Kowal
|
1176ffa1ad
|
Omaha #3914 - increment yajsw release
Former-commit-id: 1249cd8a28 [formerly c2e0b33c19] [formerly aad5e554b9] [formerly 1249cd8a28 [formerly c2e0b33c19] [formerly aad5e554b9] [formerly 0b65eb314d [formerly aad5e554b9 [formerly 9a3e3a2cfdc29926e2d08c7a8e33d45f9ce5f22a]]]]
Former-commit-id: 0b65eb314d
Former-commit-id: bc57b285f3 [formerly 544c5e39eb] [formerly 6a88a0c7e0d5a026903c015567666e9ed2cdde95 [formerly 9efc72561b]]
Former-commit-id: 608ce9f326f155f2a382a4fe899e3b5510518fcb [formerly e3bad2212b]
Former-commit-id: 7279d157bb
|
2014-12-10 10:34:26 -06:00 |
|
Bryan Kowal
|
1249cd8a28
|
Omaha #3914 - increment yajsw release
Former-commit-id: 0b65eb314d [formerly aad5e554b9 [formerly 9a3e3a2cfdc29926e2d08c7a8e33d45f9ce5f22a]]
Former-commit-id: aad5e554b9
Former-commit-id: c2e0b33c19
|
2014-12-10 10:34:26 -06:00 |
|
Brian Graham
|
99143e0045
|
ASM #15662 - Updated spec files to include AWIPS version
Change-Id: If8f78761550355a1ec55b6abde594583821d4d9f
Former-commit-id: 11741b03db9424aa10086553729303fa23a7366f
|
2014-12-09 09:25:59 -05:00 |
|
Brian Graham
|
6fd5a319dc
|
ASM #15662 - Updated spec files to include AWIPS version
Change-Id: If8f78761550355a1ec55b6abde594583821d4d9f
Former-commit-id: 97bf1ddbd6 [formerly aabc38c52c] [formerly 99143e0045] [formerly 97bf1ddbd6 [formerly aabc38c52c] [formerly 99143e0045] [formerly e1b4c4abe3 [formerly 99143e0045 [formerly 11741b03db9424aa10086553729303fa23a7366f]]]]
Former-commit-id: e1b4c4abe3
Former-commit-id: 22e53eca19 [formerly 29912607c9] [formerly 6ab29ce6401f1bdd9988b72b8136d6f7030cc71b [formerly 24ca442651]]
Former-commit-id: dda449188d7535ab185d69024efd9c2005a2a4d7 [formerly 10fd784dd7]
Former-commit-id: 963b52651e
|
2014-12-09 09:25:59 -05:00 |
|
Brian Graham
|
97bf1ddbd6
|
ASM #15662 - Updated spec files to include AWIPS version
Change-Id: If8f78761550355a1ec55b6abde594583821d4d9f
Former-commit-id: e1b4c4abe3 [formerly 99143e0045 [formerly 11741b03db9424aa10086553729303fa23a7366f]]
Former-commit-id: 99143e0045
Former-commit-id: aabc38c52c
|
2014-12-09 09:25:59 -05:00 |
|
Bryan Kowal
|
9e55db1c52
|
Omaha #3508 - remove references to yajsw in %files
Former-commit-id: 471f14a73ca4e6575e5a2316ac17cddc5ca42bb9
|
2014-12-05 10:04:42 -06:00 |
|
Bryan Kowal
|
121f1068ca
|
Omaha #3508 - remove references to yajsw in %files
Former-commit-id: 9e77b9635e [formerly 9e55db1c52 [formerly 471f14a73ca4e6575e5a2316ac17cddc5ca42bb9]]
Former-commit-id: 9e55db1c52
Former-commit-id: 16a33efd8b
|
2014-12-05 10:04:42 -06:00 |
|
Bryan Kowal
|
d66c1a0d43
|
Omaha #3508 - remove references to yajsw in %files
Former-commit-id: 121f1068ca [formerly 16a33efd8b] [formerly 9e55db1c52] [formerly 121f1068ca [formerly 16a33efd8b] [formerly 9e55db1c52] [formerly 9e77b9635e [formerly 9e55db1c52 [formerly 471f14a73ca4e6575e5a2316ac17cddc5ca42bb9]]]]
Former-commit-id: 9e77b9635e
Former-commit-id: e1a62ff167 [formerly 5644901634] [formerly 9d2131c1c4195c68ae2b4242ce29d62a04093299 [formerly 7575599185]]
Former-commit-id: 336cd43d4b46abfdcfc533ea65ab126e5d21c0c7 [formerly cc4ee08244]
Former-commit-id: 3ec292bebb
|
2014-12-05 10:04:42 -06:00 |
|
Bryan Kowal
|
19f6551c88
|
Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
Former-commit-id: f6a3317e329728080f8efe8db545e3324161986e
|
2014-12-05 09:20:23 -06:00 |
|
Bryan Kowal
|
4aaf636e18
|
Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
Former-commit-id: 48ec32e595 [formerly 19f6551c88 [formerly f6a3317e329728080f8efe8db545e3324161986e]]
Former-commit-id: 19f6551c88
Former-commit-id: 289689e774
|
2014-12-05 09:20:23 -06:00 |
|
Bryan Kowal
|
4b83570666
|
Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
Former-commit-id: 4aaf636e18 [formerly 289689e774] [formerly 19f6551c88] [formerly 4aaf636e18 [formerly 289689e774] [formerly 19f6551c88] [formerly 48ec32e595 [formerly 19f6551c88 [formerly f6a3317e329728080f8efe8db545e3324161986e]]]]
Former-commit-id: 48ec32e595
Former-commit-id: 0e79d9e7a8 [formerly aba4679eb6] [formerly 39a25df1c5ea9e51a812bdbf1ec764e207623861 [formerly 9f5297504d]]
Former-commit-id: 53663102c30f8e33519ac669cb7464894a692105 [formerly ec8371db52]
Former-commit-id: 258f7a93ca
|
2014-12-05 09:20:23 -06:00 |
|
Greg Armendariz
|
8803a6b658
|
Merge "Omaha #3508 - purge non-centralized yajsw distributions" into omaha_14.4.1
Former-commit-id: 58b7cbad88b75985e8a0d6bd4c2db72b5ce28d23
|
2014-12-05 08:57:37 -06:00 |
|
Greg Armendariz
|
1a012a8f2f
|
Merge "Omaha #3508 - purge non-centralized yajsw distributions" into omaha_14.4.1
Former-commit-id: 610f38e9ef [formerly 8803a6b658 [formerly 58b7cbad88b75985e8a0d6bd4c2db72b5ce28d23]]
Former-commit-id: 8803a6b658
Former-commit-id: f6f50778c7
|
2014-12-05 08:57:37 -06:00 |
|