Fay.Liang
|
59f3f87190
|
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 |
|
David Friedman
|
beb5074ddd
|
ASM #17009 - Add Guam to countyTypes.txt file to account for "no counties"
Change-Id: Ic8dc2519b1cfb35bf3a2e0d8d61c007e108429a8
Former-commit-id: 61ee73806f184b0d4092b8474f18b3525d92a20b
|
2015-02-04 19:56:47 +00:00 |
|
Qinglu.Lin
|
94ee166aa1
|
ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's
Change-Id: I843e5dd289c9e2841a28b228a8dbc38dce965ad1
Former-commit-id: d4e1fca39f82eb39fc911c091eb579a785a6cef9
|
2015-01-20 16:20:58 -05:00 |
|
Roger Ferrel
|
398a8d6043
|
Omaha #3353 Fix deadlock that freezes cave.
Change-Id: I4afa5c505178f30ada5dd58612b0703ab9529e6b
Former-commit-id: 871fa68ddf242f1e63286939b1324fc3197c7336
|
2014-11-04 14:13:29 -06:00 |
|
Steve Harris
|
a5398d8035
|
Merge tag 'OB_14.3.1-31m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java
Former-commit-id: 361f7bcf425edaf687cbfc63d4c165790b45a5bf
|
2014-11-04 13:17:44 -06:00 |
|
Shawn.Hooper
|
58db54ff05
|
ASM #15033 - Allow generic warning types to show up continuously during Warning cycle
Change-Id: I6e0884b1bbc1e4bed3300bb9dc0f0b3f779aa212
Former-commit-id: 41e18e5104eac8ee3335a80d678d74c7a56b196a
|
2014-11-03 10:30:05 -05:00 |
|
Steve Harris
|
54c14a5f5b
|
Merge tag 'OB_14.3.1-30m' into omaha_14.4.1
Former-commit-id: 9f4fc2a9cbff7f8555c7bf8326bb785f791e8b00
|
2014-10-30 09:40:20 -05:00 |
|
Brian.Dyke
|
9907c37a0e
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: d12d6cf7e6862a87c00f833ee02e72e5c0ad8252
|
2014-10-28 15:25:05 -04:00 |
|
Brian.Dyke
|
f8ce701c85
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
Former-commit-id: 52ba693c7d77f4e29db6bc5202c9764509bce58d
|
2014-10-28 15:23:11 -04:00 |
|
Baoyu Yin
|
c9bc14a668
|
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 28 fix for FFW error ; fixes #4796
Change-Id: I4f43f1365c3ad4d11314f199c4d896aa542a48c0
Former-commit-id: 54d2f956f53d2fe8a6fa0550a4236d95013b8ba8
|
2014-10-28 14:32:31 -04:00 |
|
Baoyu Yin
|
2c0c42dcdd
|
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 27 ; fixes #4796
Change-Id: I636b0cbb46b31f46cb2d017a4b3047108c98f0c9
Former-commit-id: b447742f498bceaf5f522a637d6ae501f80dfa23
|
2014-10-27 10:15:39 -04:00 |
|
Baoyu Yin
|
c1d51b3588
|
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 24 ; fixes #4796
Change-Id: I2df1ea83b9cd17735ee835914febd3739ff4671d
Former-commit-id: ecc2b0c99a4e849b9472dd6c0cd63416e880d4cb
|
2014-10-24 14:28:08 -04:00 |
|
Benjamin Phillippe
|
7845e8e40f
|
Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29
Former-commit-id: 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5
|
2014-10-20 12:42:19 -05:00 |
|
Steve Harris
|
aff75d954b
|
Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: 4be51191bc64978e3c455702bede3456666fbffe
|
2014-10-15 08:42:02 -05:00 |
|
Qinglu.Lin
|
636f054077
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I2a64416b861d3b374538db8efad51a9509a87892
Former-commit-id: 7124fd252f130417a9dcdac148480058d6eb0aba
|
2014-10-06 16:05:26 -04:00 |
|
Steve Harris
|
39c5e9c314
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: df9ef1f664e14fa7843328338c5b234022f4bfd4
|
2014-10-06 13:57:59 -05:00 |
|
Steve Harris
|
da463c484e
|
Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
Issue #3648:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Issue #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
Also modified with the resolution of #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java
Former-commit-id: 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd
|
2014-10-03 10:18:34 -05:00 |
|
Shawn.Hooper
|
f9428ace1f
|
ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720
Former-commit-id: ea8e4c3a30bceb2f3b53159317382ae651aa5531
|
2014-10-01 15:58:48 -04:00 |
|
dmsys
|
8c3625cfec
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c
|
2014-09-30 13:45:54 -04:00 |
|
Steve Harris
|
90e08b96e1
|
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: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
|
2014-09-29 12:58:56 -05:00 |
|
Brian.Dyke
|
0a497fc015
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 01cb1dc674ae1249d97dc10be5c068de0ed2a222
|
2014-09-29 11:20:57 -04:00 |
|
Shawn.Hooper
|
da77322fd0
|
ASM #600 - WarnGen: template optional watch inclusion
Change-Id: I282e94236389a907326926a68e2ed810a00b9688
Former-commit-id: 04bd69f437b897d63ac78d6cbd7c60451366cc6d
|
2014-09-25 16:25:43 -04:00 |
|
Brian.Dyke
|
4b418918d4
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
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
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
Former-commit-id: e04ad21771ce410beb25e15fe300a34796a1a062
|
2014-09-24 11:05:37 -04:00 |
|
David Friedman
|
a6acf71a0a
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead
Former-commit-id: e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5
|
2014-09-23 18:39:22 +00:00 |
|
Brian.Dyke
|
c0dc990974
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 41a854146a3f4ab156b63e2ea24e60681fc586f2
|
2014-09-19 16:59:12 -04:00 |
|
Baoyu Yin
|
8568cd8419
|
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen IBW templates and 14.2.1 template corrections; fixes #4796
Change-Id: Ieb4a6d68b48351deacbddda65f1ff53485c3402d
Former-commit-id: f077d3cd4084faf8ad7c8865e84df53e59a5db72
|
2014-09-19 15:02:23 -04:00 |
|
Brian.Dyke
|
7f49052445
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 88e26cd8b378ffc81db87aee226ceca47ae58aa7
|
2014-09-19 13:08:06 -04:00 |
|
Steve Harris
|
091555cf10
|
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: 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce
|
2014-09-19 10:28:57 -05:00 |
|
Qinglu.Lin
|
0e2be5afd8
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5
Former-commit-id: e7ab29fbfebb1943e0b0702547dbd353367e797d
|
2014-09-17 10:26:25 -04:00 |
|
Brian.Dyke
|
3d9a3de6e4
|
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: a3365943e7b7972a5c86f8cb1ad39667ab9e0695
|
2014-09-09 11:44:30 -04:00 |
|
Nate Jensen
|
26e2ff44a4
|
Omaha #3356 more removal of unnecessary register buddies
Change-Id: Ic91c2d5ab93bb220a69be23c54640edae26302a3
Former-commit-id: 39bfb8fd0548c74ed9a4e95b914e90ab2f6ad526
|
2014-09-08 17:18:22 -05:00 |
|
Brian.Dyke
|
fd8ad016ef
|
Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
Former-commit-id: bc9f03426304e3bb194fbf7f356d8dd3816cd836
|
2014-09-02 16:32:54 -04:00 |
|
Qinglu.Lin
|
2374673f8d
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: 59890eef397f3282ef26f259ca85ffea3db7b710
|
2014-09-02 14:37:19 -04:00 |
|
Steve Harris
|
793064063b
|
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: 8793dca41f756ba812206b48391caea6e593a657
|
2014-08-29 10:17:52 -05:00 |
|
David Friedman
|
a2dfe8e8f6
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: 6bfa1d6662b00925814be7126592bbe340651649
|
2014-08-28 15:43:32 +00:00 |
|
Brian.Dyke
|
e654318431
|
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: 7334d3991903dfe8a62728de33c21e81534fdbb6
|
2014-08-27 11:19:19 -04:00 |
|
Roger Ferrel
|
ca3a0595d2
|
Omaha #3353 Changes to remove Geospatial data set generation off the UI thread.
Change-Id: I5213f627a97a27bdb92c4857eac4071c5450b790
Former-commit-id: f16a8ff2c51c392957e13ef63423abe9f99b3301
|
2014-08-25 07:59:26 -05:00 |
|
Brian.Dyke
|
325887e605
|
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: 65e2373d13c7d5b33d579b87d98a8265252ea391
|
2014-08-22 14:16:22 -04:00 |
|
Fay.Liang
|
f5901b8ede
|
ASM #600 - the fixes for DR 17380
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
Former-commit-id: 89c29c1228830d301b7046ebb7d4281666c2b768
|
2014-08-15 11:03:15 -05:00 |
|
Qinglu.Lin
|
9a9e32dc53
|
ASM #515 - WarnGen product QC incorrectly reports UGC/area mismatch
Change-Id: I5ef8e83c826d3fb1d5ef72d5866f882d9c97e1f5
Former-commit-id: bafc616881af28b5397c45c5155a3c812a9c048d
|
2014-08-15 11:01:30 -05:00 |
|
Nate Jensen
|
b3083a663e
|
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 48536dd79d933508ac54b3b6e9bbd166fd218330
|
2014-08-14 10:22:37 -05:00 |
|
Jonathan Sanchez
|
0302efdc77
|
Issue #3493 Grouped common VTECs together
Change-Id: Ia72150a4782e95ea075f42979c489f7ef5d69fb9
Former-commit-id: 47de8da4cadd899ae9aa0ffe6c89a109491966bc
|
2014-08-06 17:40:44 -05:00 |
|
Jonathan Sanchez
|
2946dc1904
|
Issue #3493 Allowed multiple watches to be displayed.
Change-Id: I8c69a07a5162868bc2a179960c7beb07d350cde9
Former-commit-id: e06ba2d33f9969ee3dc87491ac6bfa3e9ccb40b8
|
2014-08-05 12:23:16 -05:00 |
|
Steve Harris
|
0fb743ec44
|
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: f7d474895366eb23ae5eef242a4568f911435aa3
|
2014-08-04 22:20:29 -05:00 |
|
Brian.Dyke
|
9abb02ea8a
|
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: b209604e1f0d6e790980d0bc8f1760e38f448076
|
2014-08-04 13:10:13 -04:00 |
|
Jonathan Sanchez
|
86a8ca4a30
|
Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: 135d7ffa84af58d7b3c9575e654fa1298b76b2e2
|
2014-07-22 15:32:12 -05:00 |
|
David Friedman
|
a45fe1dad0
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20
|
2014-07-03 13:58:24 +00:00 |
|
Richard Peter
|
93bbd98cbc
|
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: fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9
|
2014-07-01 15:34:39 -05:00 |
|
Steve Harris
|
d4dc1723c1
|
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: d25ab509cb53d559edbd520dd1e3c036166f2e29
|
2014-07-01 11:08:46 -04:00 |
|
Steve Harris
|
b84dda5930
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: ce5767f2bbf5c9627bd43e766c6193c261c48af3
|
2014-06-20 14:01:55 -04:00 |
|