xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7393 commits 31 branches 40 tags 3.8 GiB
Commit graph

305 commits

Author SHA1 Message Date
Roger Ferrel
24c969a249 Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region. 
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a

Former-commit-id: 597fdb8280 [formerly 46d3bbcc99d93845dcb159012b872fe746756b7c]
Former-commit-id: 462e0d85c0
 2014-12-04 12:52:22 -06:00
Richard Peter
1a88edfa4f Merge "Omaha #3870 Updated table to include missing elements." into omaha_14.4.1 
Former-commit-id: 6759ffa76c [formerly e7056504ae5758e2b4abbdef9cec7b2467d49add]
Former-commit-id: 6d046826dc
 2014-11-26 10:13:40 -06:00
Roger Ferrel
0ae4219196 Omaha #3870 Updated table to include missing elements. 
Former-commit-id: fedc4aae8a [formerly 7569e4f2b962d22453b7414ea882f2383cec9ade]
Former-commit-id: c4cf624d04
 2014-11-25 14:31:05 -06:00
Roger Ferrel
da25f4588d Omaha #3866 Configuration files for GFS20KM for product and volume browsers. 
Former-commit-id: 0df840602e [formerly 56833ab1b84e50c6ca4150d3c90501448233313b]
Former-commit-id: 9b986c7cf8
 2014-11-25 10:01:30 -06:00
Steve Harris
a8a97501ac Merge tag 'OB_14.3.1-32m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/build.edex/esb/conf/logback-ingest.xml
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java

Former-commit-id: 9de825c332 [formerly 565efec2ebe5a3a1a009d213a77617f4a593aa6b]
Former-commit-id: a16abe1b8b
 2014-11-10 08:42:01 -06:00
Brian.Dyke
4ac24af0a9 Merge branch 'master_14.2.4' into master_14.3.1 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: acf00264f4 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]
Former-commit-id: aae68215c8
 2014-11-06 12:55:21 -05:00
Steve Harris
e9c9a17f96 Merge tag 'OB_14.3.1-27m' into omaha_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml

Former-commit-id: bfade7674d [formerly ea787b645974850607658e5a7dfc4a072d831a3b]
Former-commit-id: dc557b2d0c
 2014-10-22 11:45:39 -05:00
Brian.Dyke
7f719d0124 Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: 0d5f2c0add [formerly ea0a81b12c7b1a0154361d97882ef65fc55b20e1]
Former-commit-id: c60124fa61
 2014-10-16 11:21:39 -04:00
Nate Jensen
2fc8887e08 Omaha #3730 export postprocessors package 
Change-Id: Ie87558540777c1cea7354b040e386ba67f835311

Former-commit-id: d5a5d55265 [formerly db613b63005c2763ca94851182042867aedd43c9]
Former-commit-id: 5dd168e76a
 2014-10-15 14:46:12 -05:00
Steve Harris
06a27b2d3c Merge tag 'OB_14.3.1-24m' into omaha_14.4.1 
Former-commit-id: 2db03d95b3 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]
Former-commit-id: 39c5e9c314
 2014-10-06 13:57:59 -05:00
Darrel Kingfield
66dcc60acf VLab Issue #4922 - Rotation Tracks patch check-in 
Former-commit-id: aa168071aa [formerly 48565726c39ea8139d4a3dfd505732cee2d32b16]
Former-commit-id: 8113b2ba69
 2014-10-06 10:01:36 -05:00
Brian.Dyke
006bdb00ad Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: f3f95aabb0 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]
Former-commit-id: 65ad6056b6
 2014-10-02 10:38:51 -04:00
Slav Korolev
05a7f534bf Issue #3659 - Enabled to display HFR-EAST_6KM or HFR-WEST_6KM data as a Time Series 
Former-commit-id: ad4bae10c9 [formerly 2a03c64bb098a141c82aac4bab42d7d9f4a6296f]
Former-commit-id: f7bcb81010
 2014-10-01 16:45:33 -04:00
Steve Harris
3598e9b5b6 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: 3b6a8a1447 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]
Former-commit-id: 90e08b96e1
 2014-09-29 12:58:56 -05:00
Ben Steffensmeier
6090625040 Omaha #3132 - merge master_14.3.1 into omaha_14.4.1 
Former-commit-id: 5b10ac2f36 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]
Former-commit-id: f92d021e96
 2014-09-29 10:49:14 -05:00
Steve Harris
2e2072a963 Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java

Former-commit-id: b979960b7b [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]
Former-commit-id: 7692e3f21d
 2014-09-23 11:41:10 -05:00
Brian.Dyke
75f3bb31d5 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 8d665b93b5 [formerly 8d5d8cdfd272f8000a6a21a4128998889eb2ab30]
Former-commit-id: 4db67c581c
 2014-09-19 16:56:50 -04:00
Brian.Dyke
9fc3eb20c1 Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: 9c33ae6d2c [formerly e895f7927a95c2416c05953e131d9e0c6095beb3]
Former-commit-id: 6ad8d500ef
 2014-09-19 14:42:29 -04:00
Darrel Kingfield
3eeaa8f359 VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603 
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872

Former-commit-id: 88a8dddef3 [formerly a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a]
Former-commit-id: 1cabae50b1
 2014-09-19 11:14:09 -05:00
Steve Harris
da530db540 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: 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]
Former-commit-id: 091555cf10
 2014-09-19 10:28:57 -05:00
Brian.Dyke
1c0d6624a3 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: 57a361073d [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]
Former-commit-id: e1c88f287a
 2014-09-17 15:50:13 -04:00
Nate Jensen
877aab446c Omaha #3356 fix ingestGrib level factory initialization order 
Change-Id: Iaad6d7aa9999f8387ed32806c655e5dee7e6a985

Former-commit-id: b89781c419 [formerly 0ed8b10495a08f1f120cfb3ed4e99e011e3db5a2]
Former-commit-id: b516c4b8c8
 2014-09-16 13:24:46 -05:00
Stephen Gilbert
e7d21b0293 Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1 
Former-commit-id: 440bddda4b [formerly 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3]
Former-commit-id: 5bf2ed644a
 2014-09-15 13:20:34 -04:00
Brian.Dyke
54b26b3616 Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: 1541e4c255 [formerly 8e4f6e96f7b70d6f2b7517f3f0695350506169c7]
Former-commit-id: 216f34fb25
 2014-09-15 10:46:25 -04:00
Stephen Gilbert
2406f0786f Merge branch 'ncep_14.2.1-n' into ncep_14.3.1 
Conflicts:
	cave/build/cave/customTargets.xml
	edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
	ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
	ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
	ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.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/natives/NsharpNative.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
	ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
	ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties

Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6

Former-commit-id: 662436c2d5 [formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]
Former-commit-id: 561b751e58
 2014-09-11 11:14:33 -04:00
Nate Jensen
1c77f66608 Omaha #3356 updates for improved level lookup 
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362

Former-commit-id: 62b84b2fb3 [formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]
Former-commit-id: ae9cffaaea
 2014-09-09 15:38:53 -05:00
Brian.Dyke
fe85eb9f70 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: 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]
Former-commit-id: 3d9a3de6e4
 2014-09-09 11:44:30 -04:00
Brian.Dyke
5415a4939a Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml

Former-commit-id: af477df90e [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]
Former-commit-id: 858b91d677
 2014-09-08 14:54:16 -04:00
Brian.Dyke
cdd1e08ee3 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4 
Former-commit-id: 9f7fabb002 [formerly c1f870d9df7579741e5a1d79cdec77293115e968]
Former-commit-id: d7407481ef
 2014-09-05 10:57:14 -04:00
Ana Rivera
c77e5412a6 VLab Issue #4601 - Update to SMS DR #16720; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601 
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152

Former-commit-id: a8b04b8e63 [formerly 084970f8445dbb6b76bbad84b5dc986d961d2383]
Former-commit-id: 6d48576930
 2014-09-05 13:27:29 +00:00
Stephen Gilbert
4abe38b3ac VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n 
AWW and Upper Air updates. Revert some RTS xml files

Change-Id: I4cc48defcea33b9008c9734c1c53a193d0ce94da

Former-commit-id: 75277cb034 [formerly 72fa8af848f1452a517a62c6a54eae265a9ec8a1]
Former-commit-id: 32dffe58c8
 2014-09-03 14:33:37 -04:00
Brian.Dyke
e425e5bf8c Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4 
Former-commit-id: 611e036e75 [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]
Former-commit-id: f0875e724f
 2014-09-02 16:30:51 -04:00
Steve Harris
bddf9c0f27 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: 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]
Former-commit-id: 793064063b
 2014-08-29 10:17:52 -05:00
Brian.Dyke
cbe59aded5 Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: 2c25f68437 [formerly f34bc4f81eb5ac92ef306f73f8c34243d3f78e31]
Former-commit-id: 6f3d0508e4
 2014-08-29 10:19:02 -04:00
Baoyu Yin
cbc7d2813f VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563 
Change-Id: I5f5c55486f209b89ecf276bb38d3d42c7f60d1d1

Former-commit-id: bfc550b378 [formerly 5189ae1c3ce12320045c431d9552036ea9272cef]
Former-commit-id: bf5bb1bacf
 2014-08-29 10:17:54 -04:00
Ana Rivera
e033ed5546 VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617 
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1

Former-commit-id: 9af77831a6 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]
Former-commit-id: 160dabc4d1
 2014-08-28 18:38:26 +00:00
Brian.Dyke
a08db8d73d 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: aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]
Former-commit-id: e654318431
 2014-08-27 11:19:19 -04:00
Steve Harris
8c5026314c Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java

Former-commit-id: 038b284066 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]
Former-commit-id: 99ae9bdc10
 2014-08-26 16:25:21 -05:00
Brian.Dyke
3459e1fcbc Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: 175f4e67c1 [formerly a6d5822b5cb5bb3aa62fcc95e980b08c685a3be3]
Former-commit-id: d168e371aa
 2014-08-26 15:00:55 -04:00
Brian.Dyke
2ddc920a4a 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: dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]
Former-commit-id: 325887e605
 2014-08-22 14:16:22 -04:00
Brian.Dyke
5b2b0d2bd9 Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4 
Former-commit-id: 94577a1626 [formerly b2674ef57183706feb2bb17175d730bb2e213281]
Former-commit-id: a830b6d94c
 2014-08-22 14:13:48 -04:00
Brian.Dyke
93be1a54c7 VLab Issue #3648 - Corrected NCEP additions for ESTOFS model -fix gribModels_NCEP-7.xml tag 
Former-commit-id: ae5656ca46 [formerly 1b83b788aee082b489ce0fe5dc6d775e2f621e01]
Former-commit-id: 7b8fef0fa3
 2014-08-21 11:07:02 -04:00
Roger Ferrel
d76722987e Issue #3439 Name change per suggestions in email. 
Former-commit-id: f110ca1f3d [formerly 44c3b86c9dc0b978acc66c5f79255270ce0acb41]
Former-commit-id: fb54b80ed5
 2014-08-19 16:41:06 -05:00
Slav Korolev
1c896cedab Issue #2875 - Implemented HFR Surface Current Velocity. 
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761

This reverts commit 55a1120bdb [formerly dd9d117f90] [formerly e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]].

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml

Former-commit-id: a779c786f1 [formerly aee044437492438381db98cc6fd3a917f6c05659]
Former-commit-id: a9bed4c6fd
 2014-08-19 10:12:36 -05:00
Melissa Porricel
9f20c63f97 ASM #15699 - Fix Grib decoder error 
Change-Id: Ieabe763de544960f6e7bae0e2cf940eaa2493511

Former-commit-id: 7e78946ee0 [formerly e8c156d166cedc1553f9ffd8867633651443872d]
Former-commit-id: 67e44f145a
 2014-08-15 13:41:53 -04:00
Stephen Gilbert
84c3e1ed26 VLab Issue #3648 - Corrected NCEP additions for ESTOFS model 
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml

Former-commit-id: 77fa357a15 [formerly aef15e75c53666aa65dd4687725e9dbd8e6122e0]
Former-commit-id: f6225b8969
 2014-08-15 11:03:48 -05:00
Ana Rivera
1daa44291e VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648 
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 9bf2df23be [formerly b7815d59250a73ee587d57bd2ece84691fe8707c]
Former-commit-id: a44d5d91db
 2014-08-15 11:02:36 -05:00
Ana Rivera
cc354742e1 VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data 
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml

Former-commit-id: 95451b2959 [formerly d95450f2eebc6b3d10093bd16736b349a1d0b12b]
Former-commit-id: a053fd5bad
 2014-08-15 11:01:23 -05:00
Roger Ferrel
2223d9500e Issue #3439 Changes to add new GFS data to Product and Volume Browser. 
Change-Id: I6314cb1a99aada35290a52e03810d4d51b224a9d

Former-commit-id: 518ec99c00 [formerly 658976d6c9485a3abe4d8a5ba759897407ec1239]
Former-commit-id: eef17da8cd
 2014-08-13 14:40:13 -05:00
Steve Harris
55a1120bdb Issue #3507 - Revert "Issue #2875 - Implemented HFR Surface Current Velocity." 
This reverts commit 50e93daab7 [formerly 978349e517] [formerly 7ae3ca0bfc [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]].


Former-commit-id: e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]
Former-commit-id: dd9d117f90
 2014-08-12 10:19:12 -05:00