Ron Anderson
5f1def2898
Omaha #4442 Fix template change that broke locking for extensions.
...
Change-Id: I1c6d673db53534e1e3badeb2c55eec74422821c8
Former-commit-id: 739b40303f3bd33973594a87eeb7f07700b51985
2015-06-23 15:34:31 -05:00
Ron Anderson
e2e117d18e
Omaha #4547 Replace ... with , in lists. Fix areal flood followup case.
...
Change-Id: I55c3abbe1d9190c4646beb7fafc51ca3e8eef1fa
Former-commit-id: 5b094dd5f15345e149ef3e32ff991d9ece2832f0
2015-06-23 14:28:40 -05:00
Ron Anderson
496cdd87bc
Omaha #4547 Update WarnGen templates for mixed case
...
Change-Id: Ice9cdeffc93162d081147e789655e5d6b46ff767
Former-commit-id: 472b3ad2d1257f1f1ee994c9af209c1a7389c9b7
2015-06-09 11:31:12 -05:00
Ron Anderson
15dfb5afef
Omaha #4441 and #4442 Fix WarnGen QC and locking issues with mixed case.
...
Change-Id: I95705831aa37e0774b09a0d2acee42c86d361368
Former-commit-id: ac3c7983f3c287cad4e0f38b0231b64ad69a60a6
2015-06-08 08:27:41 -05:00
Mark Peters
3a252033ff
Omaha #4469 Some files are missing from plugins' build.properties
...
Change-Id: Ib36f309d1cce20ad908b32a8a1d1218fde6863d7
Former-commit-id: 4e596c0cde3e6e04a92a3766224b153989feb676
2015-05-19 11:47:40 -05:00
Steve Harris
23cb520937
Merge tag 'OB_15.1.1-8' into omaha_16.1.1
...
15.1.1-7
Conflicts (these files were moved to AWIPS2_baseline):
rpms/awips2.core/Installer.java/build.sh
rpms/awips2.core/Installer.java/common/scripts/profile.d/awips2Java.sh
Former-commit-id: df806c9479cb29a5f47f1511ad70e140b2bbf8ec
2015-05-05 15:24:22 -05:00
Fay.Liang
d656fcc287
Merge branch 'ops_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
...
Former-commit-id: 664cdfb4408cecac0e4e5c6ce33d4f0b7df85164
2015-04-27 14:10:21 -04:00
Baoyu Yin
1e06dda47a
VLab Issue #7716 - DR17315 dupCounties.vm not working in WarnGen and DR17318 Independent Cities outside of VA not locked in WarnGen; fixes #7716
...
Change-Id: I2b7f68ba663c261cf0b4284972792af0804d2d0f
Former-commit-id: 25aa467c5732d26c40fb7dad6e7f372051b0e1ec
2015-04-22 08:36:28 -04:00
David Gillingham
0e07177b94
Omaha #4320 : Add QC check to warngen products to test that product passes through WarningDecoder without error.
...
Change-Id: I1b5ccfafa9701cc9387a7f29459df02367c2c249
Former-commit-id: e08bcbfbd25286e547dccafbf00269c41392fccb
2015-03-25 23:14:18 -05:00
Mark Peters
138fa3b0e8
Omaha #4227 Add support for retrieving warnings data through Data Access Framework
...
Change-Id: Ie0a68b2c714a903d14ecf25a4827f6bba0962478
Former-commit-id: fc570a7a2eadf0c07bf6a485ec215b64c10b16a9
2015-03-24 12:40:24 -05:00
Steve Harris
67b3a77c4f
Merge tag 'OB_14.4.1-18m' into omaha_15.1.1
...
14.4.1_18m
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 41217304fa68101d17e003b2fa6992d0e15b083c
2015-03-18 09:29:01 -05:00
Fay.Liang
0e475cb704
Merge tag 'OB_14.3.2-19m' into master_14.4.1
...
14.3.2-19m
Conflicts:
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 4b3626307cf35ada45985c25cf062e7b857db764
2015-03-09 16:11:13 -04:00
Qinglu.Lin
dcef82c4d6
ASM #17169 : WarnGen Templates: IBW marine CTA and impact updates
...
Change-Id: I59e000340b6a82dc439128f3ad6963476b669344
Former-commit-id: 441be68f8726618225b0c7a5077443b8a7815d99
2015-02-27 16:10:22 -05:00
Nate Jensen
a05af9b1b1
Omaha #3978 use InputStream instead of LocalizationFileInputStream or
...
read()
Change-Id: Ief0137559617f15ac9d7f6510b74630affa5aed5
Former-commit-id: 3a6c19cccad2a8ae2db0a49c47d737a5c5e0436c
2015-02-24 09:57:11 -06:00
Steve Harris
118f52263f
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Former-commit-id: ffee274d844442a36d633deda5776c09a758cb38
2015-02-12 12:48:29 -06:00
Fay.Liang
43c7161dcf
Merge branch 'master_14.3.2' into master_14.4.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: e91a78eec910b84f44350d3aae68a26f4e0dcd72
2015-02-09 17:19:41 -05:00
David Friedman
d1b3f2a5f4
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
30b5bc6a62
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
Chris Cody
14f12323d3
Omaha #3996 NullPointerException Occurs when Drawing and Issuing Hazards
...
Change-Id: I2ccc6596bbff035a4904a1fa6b0fe45c3416c85e
Former-commit-id: 0b64b70ab9c1f518062fd8f0c78ac51abea6e11b
2015-01-14 15:48:13 -06:00
Roger Ferrel
acbde703a2
Omaha #3353 Fix deadlock that freezes cave.
...
Change-Id: I4afa5c505178f30ada5dd58612b0703ab9529e6b
Former-commit-id: 871fa68ddf242f1e63286939b1324fc3197c7336
2014-11-04 14:13:29 -06:00
Steve Harris
e770670ebf
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
f8ee619f16
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
5efdd0d572
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
94ddd59bfc
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
765359aee6
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
4252ccfcb1
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
bb89f99643
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
fe574dd41d
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
fdd16051e8
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
f2fdf98d2f
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
47be3aa143
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
2db03d95b3
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
2616fe04b6
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
ae02cbc2da
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
9f4560c480
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
3b6a8a1447
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
46af1d0857
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
831af82c23
ASM #600 - WarnGen: template optional watch inclusion
...
Change-Id: I282e94236389a907326926a68e2ed810a00b9688
Former-commit-id: 04bd69f437b897d63ac78d6cbd7c60451366cc6d
2014-09-25 16:25:43 -04:00
Brian.Dyke
87fa32d2d4
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
2ee1ebe72d
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
1018c65552
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
28b7e8d6e2
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
e601d3fa51
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
4c56844e29
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
5e93999662
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
01dfe503f5
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
b46f23d01b
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
14e64881a1
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
ae13ea419e
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
5d58625abc
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
