Steve Harris
|
e05d31ae36
|
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: f4b771ea72 [formerly da463c484e] [formerly f4b771ea72 [formerly da463c484e] [formerly 2616fe04b6 [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]
Former-commit-id: 2616fe04b6
Former-commit-id: 306826aed9 [formerly 523cedbb56]
Former-commit-id: 57f5294f08
|
2014-10-03 10:18:34 -05:00 |
|
dmsys
|
71d6e48473
|
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: f704781f4f [formerly 8c3625cfec] [formerly f704781f4f [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]
Former-commit-id: 9f4560c480
Former-commit-id: 07f84c6b26 [formerly b884e5e32d]
Former-commit-id: e00ea2d8cd
|
2014-09-30 13:45:54 -04:00 |
|
Steve Harris
|
4c4380580f
|
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: 3598e9b5b6 [formerly 90e08b96e1] [formerly 3598e9b5b6 [formerly 90e08b96e1] [formerly 3b6a8a1447 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]
Former-commit-id: 3b6a8a1447
Former-commit-id: 842abaad49 [formerly 6330a62e85]
Former-commit-id: 30f0d27dfb
|
2014-09-29 12:58:56 -05:00 |
|
Brian.Dyke
|
23450210b1
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: fce029653d [formerly 0a497fc015] [formerly fce029653d [formerly 0a497fc015] [formerly 46af1d0857 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]]]
Former-commit-id: 46af1d0857
Former-commit-id: 886c1b7e3d [formerly 85676ff532]
Former-commit-id: 4d5f7db303
|
2014-09-29 11:20:57 -04:00 |
|
Mark Peters
|
da12370e57
|
Omaha #3629 Move datatype specific code from edex.decodertools to the specific datatype edex plugins
Change-Id: I6b66103ef55107df78fdbb047dfb8c743deaf2d4
Former-commit-id: 5fb76a1532 [formerly 549cf2a2b1] [formerly 5fb76a1532 [formerly 549cf2a2b1] [formerly 0c657c2a49 [formerly e196f02cf7533498280b252e9c345f9b3c4a3629]]]
Former-commit-id: 0c657c2a49
Former-commit-id: 34d60c7e4a [formerly 8084133432]
Former-commit-id: bd117c0ebf
|
2014-09-26 14:50:03 -05:00 |
|
Shawn.Hooper
|
7d80248869
|
ASM #16755 - Checkin fix for MPE and Hydro perspectives for Mike Duff
Change-Id: Ibd5d2caad16de2ab2a645b507c0e00bea61e9d5e
Former-commit-id: 77b4daa18e [formerly 99f6ff6d0a] [formerly 77b4daa18e [formerly 99f6ff6d0a] [formerly 94b3acd437 [formerly 4ddd428c4168eb90b6d9b01db2e0bdd02206a9e7]]]
Former-commit-id: 94b3acd437
Former-commit-id: da4d40fd8b [formerly 426b9b669a]
Former-commit-id: b70ce27ceb
|
2014-09-23 10:44:38 -04:00 |
|
Mark Peters
|
11a05cae90
|
Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools
Change-Id: I95e881042e09a18f45b4410a76dbcf828dac0d4f
Former-commit-id: 68044d2dd7 [formerly 3f1e21107b] [formerly 68044d2dd7 [formerly 3f1e21107b] [formerly c5da5ccb9b [formerly 4632e2694c2d06c6b61ae9b61eee3b3584c6bebc]]]
Former-commit-id: c5da5ccb9b
Former-commit-id: 01fa82955b [formerly edc2745d1f]
Former-commit-id: 54640500a6
|
2014-09-19 14:02:54 -05:00 |
|
Steve Harris
|
f4ea796cea
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: da530db540 [formerly 091555cf10] [formerly da530db540 [formerly 091555cf10] [formerly 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]
Former-commit-id: 4c56844e29
Former-commit-id: 84a98ec4ca [formerly 214b48dcb8]
Former-commit-id: fdc523a026
|
2014-09-19 10:28:57 -05:00 |
|
Xuezhi.Wei
|
9ed5d0d705
|
ASM #648 fix for the top of the hour issue for hourlypp
Change-Id: I794837427ee6f8dbc615cbd010aeb662ccad9896
Former-commit-id: 0933440c37 [formerly 42719b2d5b] [formerly 0933440c37 [formerly 42719b2d5b] [formerly bca2affc40 [formerly 2d36b1b9ed31404ca9c9a4ecfdbf5f1e40c05b54]]]
Former-commit-id: bca2affc40
Former-commit-id: 5095489f7c [formerly e5daf9e060]
Former-commit-id: d33f4a4140
|
2014-09-15 18:14:54 +00:00 |
|
Mark Peters
|
09003ad30b
|
Omaha #3548 PluginDataObjectFilter fails to start in spring
Change-Id: I6db18d15b5a35a081de48a885e3d27495b44b5d0
Former-commit-id: cbb5715b34 [formerly d671d1f432] [formerly cbb5715b34 [formerly d671d1f432] [formerly fb33786001 [formerly e9d50c287b6327ea03437a98fb1077b904daeecd]]]
Former-commit-id: fb33786001
Former-commit-id: 53cf3a043b [formerly a18f767151]
Former-commit-id: 8be9ecd84a
|
2014-09-11 10:32:11 -05:00 |
|
Mark Peters
|
3c730ef05f
|
Omaha #3548 PluginDataObjectFilter fails to start in spring
Change-Id: Ia69c93c5bab1c730c3c4bad6781823f989bc1641
Former-commit-id: 203e21b807 [formerly 685a9b1960] [formerly 203e21b807 [formerly 685a9b1960] [formerly 735cafee83 [formerly 4d059172e0d822a2fb740d602265da6a91e15ccc]]]
Former-commit-id: 735cafee83
Former-commit-id: 5ca19d6ab8 [formerly 6684a32468]
Former-commit-id: 9ce57d5780
|
2014-09-09 16:09:04 -05:00 |
|
Brian.Dyke
|
0f9fe8301a
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: fe85eb9f70 [formerly 3d9a3de6e4] [formerly fe85eb9f70 [formerly 3d9a3de6e4] [formerly 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]
Former-commit-id: 01dfe503f5
Former-commit-id: 29364e2b9f [formerly c42733eb39]
Former-commit-id: a31d3d702e
|
2014-09-09 11:44:30 -04:00 |
|
Brian.Dyke
|
9f0254ee22
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 4220590613 [formerly 9e1ee22146] [formerly 4220590613 [formerly 9e1ee22146] [formerly 702dd65aa7 [formerly 876c6fc4db3901fdcd8dd9a6fb343d2f65254569]]]
Former-commit-id: 702dd65aa7
Former-commit-id: 901ed0dca8 [formerly ebf9ad1299]
Former-commit-id: c868172449
|
2014-09-05 11:13:12 -04:00 |
|
Brian.Dyke
|
7bc9c15a9e
|
ASM #15697 - Fix Hydro Perspective Issue
Former-commit-id: 3ddb5831a0 [formerly 121a2d100f] [formerly 3ddb5831a0 [formerly 121a2d100f] [formerly cfe03adff6 [formerly 82d7bbe6bf005e543e1ad6772c6a18024f1b0764]]]
Former-commit-id: cfe03adff6
Former-commit-id: 50858cac9f [formerly e8a85da57a]
Former-commit-id: 7f1e3b0ead
|
2014-09-03 21:10:16 -04:00 |
|
Steve Harris
|
ecf26b3ac5
|
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: bddf9c0f27 [formerly 793064063b] [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]
Former-commit-id: 5d58625abc
Former-commit-id: 66b485c000 [formerly d984dd538f]
Former-commit-id: e681e0a457
|
2014-08-29 10:17:52 -05:00 |
|
Brian.Dyke
|
7e4ab705cc
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: a08db8d73d [formerly e654318431] [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]
Former-commit-id: aa83bf804f
Former-commit-id: f90649d7e7 [formerly f7f16ff9eb]
Former-commit-id: c0dc594eda
|
2014-08-27 11:19:19 -04:00 |
|
Brian.Dyke
|
27372f098c
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: 2ddc920a4a [formerly 325887e605] [formerly 2ddc920a4a [formerly 325887e605] [formerly dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]
Former-commit-id: dd9d7133d9
Former-commit-id: c8e9153884 [formerly 1839b614df]
Former-commit-id: cd1b914f50
|
2014-08-22 14:16:22 -04:00 |
|
Loubna.Bousaidi
|
d63ec2ac1c
|
ASM #578 apply gross range check to the adjusted value
Change-Id: Ia90bc10e6e1e1baa8f3842ade56d7551ca405e34
Conflicts:
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Former-commit-id: 8038fc4a8d [formerly e109528caf] [formerly 8038fc4a8d [formerly e109528caf] [formerly 213773cde4 [formerly d1d86dd82bfa114bf181de5cf993f2bed349ada5]]]
Former-commit-id: 213773cde4
Former-commit-id: 5c83a66633 [formerly 3c130d0007]
Former-commit-id: 7984a45084
|
2014-08-15 10:53:47 -05:00 |
|
steve.naples
|
bbb977e8d5
|
ASM #15671 Fix PostShef to allow ingest with token set load_shef_ingest and ingestfilter not populated.
Change-Id: I55d8718f9bc50c9b0ce070e8a11cf09b3b4ff0fb
Former-commit-id: f5f348d681 [formerly 8185a7cd54] [formerly f5f348d681 [formerly 8185a7cd54] [formerly 0bb82e215e [formerly ed6769c047b8b21782da9a6040f2601465c150a2]]]
Former-commit-id: 0bb82e215e
Former-commit-id: 6563cdd3c1 [formerly 41e857da36]
Former-commit-id: d808a79ccf
|
2014-08-05 16:43:53 +00:00 |
|
Steve Harris
|
a0fdc76880
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.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/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
Former-commit-id: a92dc418c6 [formerly 0fb743ec44] [formerly a92dc418c6 [formerly 0fb743ec44] [formerly bf9a0fa5de [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]]
Former-commit-id: bf9a0fa5de
Former-commit-id: b848e05aa1 [formerly 46fe792d83]
Former-commit-id: 5e2f7a9f74
|
2014-08-04 22:20:29 -05:00 |
|
Brian.Dyke
|
803ceadaec
|
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 301f3094be [formerly 9abb02ea8a] [formerly 301f3094be [formerly 9abb02ea8a] [formerly 270d2b0ddb [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: bbe6ec4d50 [formerly 37aacfcb96]
Former-commit-id: b9daa26f7d
|
2014-08-04 13:10:13 -04:00 |
|
Greg Armendariz
|
88fe72c588
|
Omaha #2914 - Remove calls to PropertiesFactory
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be
Former-commit-id: e3f927e52c [formerly b34486973e] [formerly e3f927e52c [formerly b34486973e] [formerly 09f6bd471c [formerly b59ebac85404fba5657e9041b6f2be7a1959fd9c]]]
Former-commit-id: 09f6bd471c
Former-commit-id: d51ab07c0e [formerly fcf1b5ee8a]
Former-commit-id: 5c5ab0f36c
|
2014-07-17 15:41:38 -05:00 |
|
Fay.Liang
|
ba05a236a7
|
ASM #15468 Shefdecode failed to ingest RVF product at OUN
Change-Id: I6238c25f867c0e6e491831e9c2b1c47e22484620
Former-commit-id: 7cbd90018e [formerly 87d50e7296] [formerly 7cbd90018e [formerly 87d50e7296] [formerly a00be8447d [formerly 3637d6387396f88811ec3964bd61d10ce0ee38eb]]]
Former-commit-id: a00be8447d
Former-commit-id: cc238af632 [formerly e69a6fe6f5]
Former-commit-id: 66a3732b4b
|
2014-07-15 10:22:09 -04:00 |
|
Fay.Liang
|
3a4cff44cc
|
ASM #15468 Shefdecode failed to ingest RVF product at OUN
Change-Id: Ie345c88c4a3a0ff995c4d33772f90e863bed7ee5
Former-commit-id: 34465f09ce [formerly 400561ac9c] [formerly 34465f09ce [formerly 400561ac9c] [formerly 65677246c2 [formerly f78783d2ea194539414294abff46d4f2acda65d1]]]
Former-commit-id: 65677246c2
Former-commit-id: 475da269d8 [formerly 9285e0530f]
Former-commit-id: 60b7095e20
|
2014-07-11 15:19:08 -04:00 |
|
Richard Peter
|
342192e967
|
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
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/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: 6636b301e5 [formerly 93bbd98cbc] [formerly 6636b301e5 [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 552ac6d640 [formerly fc27824dbc]
Former-commit-id: 0fefdc7cd6
|
2014-07-01 15:34:39 -05:00 |
|
Steve Harris
|
8fb747ad27
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 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/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: 2f2958df37 [formerly d4dc1723c1] [formerly 2f2958df37 [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 7fb4663d75 [formerly dcbab5621f]
Former-commit-id: 71357da9d2
|
2014-07-01 11:08:46 -04:00 |
|
Mike Duff
|
6163364939
|
Issue #3321 - Fix ingest switch checks
Change-Id: I7de7ee482ab57789874a179499e6c51079e68e12
Former-commit-id: 1d3aeb881b [formerly f17c93bb19] [formerly 1d3aeb881b [formerly f17c93bb19] [formerly d62c925baa [formerly 5df0ac7f96d1280c1c50f39982693f9503b56f14]]]
Former-commit-id: d62c925baa
Former-commit-id: 5078011147 [formerly d2cbeff06a]
Former-commit-id: 07dda3ecc1
|
2014-06-26 16:23:02 -05:00 |
|
Nate Jensen
|
6d3b2d3119
|
Omaha #3133 remove unnecessary register buddies
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4
Former-commit-id: 6077794cc9 [formerly 9219e1e254] [formerly 6077794cc9 [formerly 9219e1e254] [formerly 53633a6ed4 [formerly c91a7d4084be3753ad51afd11b46b621af0bc878]]]
Former-commit-id: 53633a6ed4
Former-commit-id: 1117e5b995 [formerly 5062338b2d]
Former-commit-id: 3239b1956b
|
2014-06-23 14:13:19 -05:00 |
|
Steve Harris
|
435da06069
|
Merge branch 'master_14.2.2' (14.2.2-13) into omaha_14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: If5dae78936eddf1bc4ee63f35beb96a0cb9defb9
Former-commit-id: 3a3277c469 [formerly ad6e9fa5ee] [formerly 3a3277c469 [formerly ad6e9fa5ee] [formerly 9510608b74 [formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]]]
Former-commit-id: 9510608b74
Former-commit-id: f78bc57920 [formerly 23dea36a2c]
Former-commit-id: 5a86a00518
|
2014-06-11 12:55:44 -05:00 |
|
Ben Steffensmeier
|
3db0af5561
|
Omaha #2061 Remove IDecoderGettable from all AWIPS2 Raytheon PDOs.
Former-commit-id: a96199cc47 [formerly d838ecc734] [formerly a96199cc47 [formerly d838ecc734] [formerly 30415ae8c5 [formerly b6c63e5791a2438253d6ff039b5164c61105a941]]]
Former-commit-id: 30415ae8c5
Former-commit-id: 08a1e07918 [formerly eb7cf7e8da]
Former-commit-id: 02c4332c6a
|
2014-06-11 12:38:35 -05:00 |
|
Brian.Dyke
|
1ae1410e46
|
Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 0f07e14bf1 [formerly f72380ad60] [formerly 0f07e14bf1 [formerly f72380ad60] [formerly 9ab17ddecb [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 816dcf74e4 [formerly 49cd9574d9]
Former-commit-id: a4b39dfca5
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
a39afc1dfa
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: ef5c74dece [formerly c1b3f9d180] [formerly ef5c74dece [formerly c1b3f9d180] [formerly 8874d41872 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]
Former-commit-id: 8874d41872
Former-commit-id: 4f0fc67b1f [formerly f568b5606a]
Former-commit-id: 81d732477e
|
2014-06-10 12:52:59 -04:00 |
|
Xuezhi.Wei
|
6911a1f357
|
ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2
Former-commit-id: 81ec03e291 [formerly bdbeec662c] [formerly 81ec03e291 [formerly bdbeec662c] [formerly 33b235a0a4 [formerly f7b5f3bbc71cc251e19f1764ee7756050895b7a3]]]
Former-commit-id: 33b235a0a4
Former-commit-id: e2f7548351 [formerly 445d58699a]
Former-commit-id: ae0a348358
|
2014-06-06 17:40:09 +00:00 |
|
Mike Duff
|
c2751cf532
|
Issue #3222 - Fix for SHEF posting times
Former-commit-id: 28a42f3f10 [formerly 8a5acd085d] [formerly 28a42f3f10 [formerly 8a5acd085d] [formerly f5f101d416 [formerly 3f1f9cf4fa6207edae642db5cffdc8284091f31a]]]
Former-commit-id: f5f101d416
Former-commit-id: 8e6a50e2ee [formerly 87d41ff302]
Former-commit-id: a615c41a57
|
2014-06-05 09:35:07 -05:00 |
|
Steve Harris
|
7eabeb7ad6
|
Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
edexOsgi/build.edex/edex/common.properties
edexOsgi/build.edex/esb/conf/modes.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so
Former-commit-id: 647cd97e29 [formerly 7fec0d039c] [formerly 647cd97e29 [formerly 7fec0d039c] [formerly 455eb8b39d [formerly 45250149681f057cf168f4d3cb27276279f62c05]]]
Former-commit-id: 455eb8b39d
Former-commit-id: 373c816e6a [formerly ec743199f1]
Former-commit-id: cbceb4ea62
|
2014-06-02 11:21:46 -05:00 |
|
Brian.Dyke
|
9351315fd6
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: a0a879be7d [formerly a8737e18f0] [formerly a0a879be7d [formerly a8737e18f0] [formerly 3f1e12effc [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]
Former-commit-id: 3f1e12effc
Former-commit-id: 3961c75ecd [formerly 66aacd6578]
Former-commit-id: a23d371522
|
2014-05-30 10:46:25 -04:00 |
|
Brian.Dyke
|
1bae94a61a
|
Merge remote-tracking branch 'remotes/origin/master_14.2.1' into master_14.2.2 CM-MERGE:14.2.1-30 into 14.2.2
Former-commit-id: 47a37b112a [formerly b7ef9420e1] [formerly 47a37b112a [formerly b7ef9420e1] [formerly 574246b6d4 [formerly f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da]]]
Former-commit-id: 574246b6d4
Former-commit-id: 45d59380ea [formerly 2c1fabb0f8]
Former-commit-id: 551def9f1a
|
2014-05-28 16:25:33 -04:00 |
|
Steve Harris
|
5fda99b1fe
|
Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java
Former-commit-id: 718c78d984 [formerly be80bd01f3] [formerly 718c78d984 [formerly be80bd01f3] [formerly dc74953978 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]
Former-commit-id: dc74953978
Former-commit-id: 0e9d0b2ef5 [formerly 713cfeffc7]
Former-commit-id: 6412cc1427
|
2014-05-28 09:01:00 -05:00 |
|
Brian.Dyke
|
992186e641
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-10 into 14.2.1
Former-commit-id: 6f64664e70 [formerly 4c010cf27a] [formerly 6f64664e70 [formerly 4c010cf27a] [formerly ce81b44f32 [formerly b92ce0c1589c48de73387c142f1302409a3b0cb7]]]
Former-commit-id: ce81b44f32
Former-commit-id: 4f434e1bf9 [formerly 73ec45c5b2]
Former-commit-id: f5bc17ef24
|
2014-05-28 09:36:15 -04:00 |
|
Brian.Dyke
|
befec4cf01
|
CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: 089b2559bb [formerly e95ee60224] [formerly 089b2559bb [formerly e95ee60224] [formerly e852623f48 [formerly c85d4369600bfc24405386aa71713d7f2d58b201]]]
Former-commit-id: e852623f48
Former-commit-id: f07b83ce91 [formerly b745ac5926]
Former-commit-id: 21112face5
|
2014-05-28 08:40:56 -04:00 |
|
Steve Harris
|
172cca39d9
|
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 3de24b7b07 [formerly 99bc6f990c] [formerly 3de24b7b07 [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: bfa4255eea [formerly 9b98b41cd4]
Former-commit-id: 144354c369
|
2014-05-27 14:48:24 -04:00 |
|
Brian.Dyke
|
d078a2630e
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-9 into 14.2.1
Former-commit-id: ea618935d0 [formerly 575cebda84] [formerly ea618935d0 [formerly 575cebda84] [formerly 638acc2c06 [formerly 34c582add16be1620f400d78d2f37da8c534f71a]]]
Former-commit-id: 638acc2c06
Former-commit-id: 2ab1fc6ddf [formerly 290b85b556]
Former-commit-id: 09f2d8b8b1
|
2014-05-27 13:42:09 -04:00 |
|
Brian.Dyke
|
7e5475923c
|
CM-MERGE:OB13.5.5-10 into 14.1.2
Former-commit-id: 4a1b6d70c4 [formerly 89a8caddbb] [formerly 4a1b6d70c4 [formerly 89a8caddbb] [formerly ba8d7dbbb7 [formerly d57f7989982a59a546116b63a406294573844039]]]
Former-commit-id: ba8d7dbbb7
Former-commit-id: bb5d88be66 [formerly ebdd53742c]
Former-commit-id: 1a69aaf89a
|
2014-05-27 13:30:35 -04:00 |
|
Steve Harris
|
e30dfd21ee
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
Former-commit-id: 376482d3b1 [formerly 518822ed83] [formerly 376482d3b1 [formerly 518822ed83] [formerly b6af2db9f5 [formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]]]
Former-commit-id: b6af2db9f5
Former-commit-id: 1dfc15a77e [formerly 14b1ea307f]
Former-commit-id: d226dfb021
|
2014-05-22 14:31:06 -05:00 |
|
Brian Clements
|
ebc9bfa351
|
Omaha #2536 merged edex.textdb into text plugins
Former-commit-id: c55124bcc7 [formerly 5b5295e5ad] [formerly c55124bcc7 [formerly 5b5295e5ad] [formerly da7d5888b0 [formerly 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c]]]
Former-commit-id: da7d5888b0
Former-commit-id: e4bb70cbe9 [formerly 003917f0ed]
Former-commit-id: 30fb567666
|
2014-05-20 16:07:20 -05:00 |
|
Brian.Dyke
|
b0b377e811
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: 822ad181bf [formerly 2fd18d14d6] [formerly 822ad181bf [formerly 2fd18d14d6] [formerly db68b80bbd [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]
Former-commit-id: db68b80bbd
Former-commit-id: 937b9bb9ce [formerly ebcaebb28d]
Former-commit-id: f42d40c3a3
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
774897735a
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1
Former-commit-id: 88a5ecefaa [formerly e5f951bf89] [formerly 88a5ecefaa [formerly e5f951bf89] [formerly 8c2cccb930 [formerly d9c230fbd50cc5acf1dd5c7c5e775f337de41921]]]
Former-commit-id: 8c2cccb930
Former-commit-id: bb2089f2df [formerly 89d2843610]
Former-commit-id: fe658cb381
|
2014-05-20 12:08:29 -04:00 |
|
Brian.Dyke
|
5d6603320b
|
CM-MERGE:OB13.5.5-9 into 14.1.2
Former-commit-id: 8435ace4f8 [formerly 545e7f6ce9] [formerly 8435ace4f8 [formerly 545e7f6ce9] [formerly abf0f995cd [formerly a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22]]]
Former-commit-id: abf0f995cd
Former-commit-id: 9af8951a2a [formerly fa13621d8e]
Former-commit-id: 0f5964b03f
|
2014-05-20 11:56:30 -04:00 |
|
brian.dyke
|
b2e3c50ec0
|
Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 9626317825 [formerly 011d121e4b] [formerly 9626317825 [formerly 011d121e4b] [formerly 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]
Former-commit-id: 58683ad040
Former-commit-id: 2e105c1d5d [formerly bc4649765a]
Former-commit-id: b42011fc76
|
2014-05-19 09:45:37 -04:00 |
|
Brian.Dyke
|
43210259de
|
Merge remote-tracking branch 'remotes/origin/master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-5 into 14.2.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.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/gfe/isc/iscMosaic.py
Former-commit-id: 2de7de6378 [formerly b066572041] [formerly 2de7de6378 [formerly b066572041] [formerly c8f21e92fe [formerly d75db45cdfa20fed7568b825ca0dfd8c8689d22a]]]
Former-commit-id: c8f21e92fe
Former-commit-id: 7cc4e0258d [formerly 984f56d23c]
Former-commit-id: 17d7291548
|
2014-05-15 16:40:47 -04:00 |
|