Michael James
|
199a7d184c
|
Merge remote-tracking branch 'origin/unidata_16.2.2' into unidata_16.1.5-osx-merge
Conflicts:
.gitignore
build/deploy.edex.awips2/esb/etc/ingestGrib.sh
build/deploy.edex.awips2/esb/etc/request.sh
cave/build/build.sh
cave/build/cave/customTargets.xml
cave/build/p2-build.xml
cave/build/static/linux/cave/caveUtil.sh
cave/build/static/linux/cave/run.sh
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisualization.java
cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/dataprovider/rsc/DataProviderRsc.java
cave/com.raytheon.uf.viz.collaboration.ui/localization/collaboration/config.xml
cave/com.raytheon.uf.viz.d2d.nsharp/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpPaletteWindow.java
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNsharpObservedSoundingDialogContents.java
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/map/D2DNsharpMapResourceData.java
cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml
cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/ClearAction.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/TwoPanelLayoutMenuAction.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2DPerspectiveManager.java
cave/com.raytheon.uf.viz.dat.feature/feature.xml
cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/rsc/DataStoreResource.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/handler/ExportImageHandler.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/DispatchGraphicsTarget.java
cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/strings/DrawStringEvent.java
cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/bundles/satellite/GoesrLegacyProfileMap.xml
cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profile-index.xml
cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java
cave/com.raytheon.uf.viz.truecolor.gl/src/com/raytheon/uf/viz/truecolor/gl/extension/GLTrueColorImagingExtension.java
cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/help/SmartInit.html
cave/com.raytheon.viz.gfe/help/localConfig.html
cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/WindGustFromAlgorithm.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementBrowserDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ZoneDbResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.pointdata/localization/bundles/SurfaceColorTemp.xml
cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSurface.xml
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/MetarPrecipResource.java
cave/com.raytheon.viz.product.awips/awips.product
cave/com.raytheon.viz.product.awips/developer.product
cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
cave/com.raytheon.viz.redbook/localization/bundles/Redbook.xml
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductsImagery.xml
cave/com.raytheon.viz.satellite/localization/menus/satellite/regionalSatellite.xml
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/edex/common.properties
edexOsgi/build.edex/edex/developer.properties
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.bufrua/utility/common_static/base/purge/bufruaPurgeRules.xml
edexOsgi/com.raytheon.edex.plugin.grib/resources/com.raytheon.edex.plugin.grib.properties
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/GFSProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/RAP13GribPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/RAP40GribPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid1440721.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.10.table
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.11.table
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.3.table
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.7.table
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.8.table
edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/radar/radarsInUse.txt
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/dao/SatelliteDao.java
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/maritimeObscuredSkyIFR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/maritimeObscuredSkyLIFR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/maritimeObscuredSkySymVFR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/transparentMaritimeSky.xml
edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/transparentSkySym.xml
edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/transparentSkySym2.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.ohd/utility/edex_static/base/distribution/dhr.xml
edexOsgi/com.raytheon.uf.edex.ohd/utility/edex_static/base/distribution/dpa.xml
edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/decoder/CWAParser.java
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/areaNames.xml
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/creatingEntities.xml
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/physicalElements.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/GpdCliRequestHandler.py
edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py
edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductRetriever.py
edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductStorer.py
edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/storeActivity.py
installCAVE.sh
installEDEX.sh
javaUtilities/build.wes2bridge.utility/ant/setup.xml
javaUtilities/build.wes2bridge.utility/build.xml
localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/scalesInfo.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/awips2.cave/deploy.builder/build.sh
rpms/awips2.core/Installer.common-base/component.spec
rpms/awips2.core/Installer.database/component.spec
rpms/awips2.core/Installer.edex-environment/edex/component.spec
rpms/awips2.core/Installer.edex-environment/wes2bridge.files/build/build.sh
rpms/awips2.core/Installer.gfe/component.spec
rpms/awips2.core/Installer.localization/component.spec
rpms/awips2.core/Installer.localization/utility/cave_static/bundles/scales/WFO.xml
rpms/awips2.core/Installer.maps-database/component.spec
rpms/awips2.core/Installer.ncep-database/component.spec
rpms/awips2.core/Installer.pgadmin/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/awips2.core/Installer.topo/component.spec
rpms/awips2.core/Installer.version/component.spec
rpms/awips2.core/deploy.builder/build.sh
rpms/awips2.edex/Installer.edex-shapefiles/component.spec
rpms/awips2.edex/Installer.edex/component.spec
rpms/awips2.edex/deploy.builder/build.sh
rpms/awips2.shapefiles/Installer.edex-shapefiles/component.spec
rpms/awips2.shapefiles/deploy.builder/build.sh
rpms/awips2.upc/Installer.edex-upc/programs/edex
rpms/awips2.upc/Installer.ldm/component.spec
rpms/awips2.upc/Installer.ldm/patch/cron/awips
rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
rpms/build/common/lookupRPM.sh
rpms/build/common/usage.sh
rpms/build/i386/build.sh
rpms/build/i386/buildEnvironment.sh
rpms/build/x86_64/build.sh
rpms/build/x86_64/buildEnvironment.sh
rpms/python.site-packages/Installer.cherrypy/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pmw/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.python-awips/component.spec
rpms/python.site-packages/Installer.thrift/component.spec
rpms/python.site-packages/Installer.tpg/component.spec
rpms/python.site-packages/Installer.werkzeug/component.spec
rpms/unidata/build.sh
rpms/unidata/buildEnvironment.sh
rpms/unidata/rsync.dirs
|
2016-09-13 10:44:13 -06:00 |
|
Shawn.Hooper
|
105e4a5ceb
|
Merge branch 'master_16.2.1-p1-lx' into master_16.2.2
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/extremeWindWarningFollowup.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm
Change-Id: I9093801630eb7c345d0ba69e684943798fb0b5d9
Former-commit-id: 8a4b0527806a73c69dc9be22e7aa1025fcb4b617
|
2016-06-08 10:55:30 -04:00 |
|
Steve Harris
|
ec8b83dd67
|
Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2
16.2.1-lx-29
Conflicts:
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/SimpleLogViewer.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcFreezeOptionsDialog.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcTempOptionsDialog.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DeletePolygonDlg.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/total/TotalLightningDecoder.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SaveCombinationsFileHandler.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm
Former-commit-id: 17c68986a20e9a589d40407800dd52678fcda68b
|
2016-05-12 09:28:49 -05:00 |
|
Steve Harris
|
b0e665ccbe
|
Omaha #5088 - remove .project files so eclipse doesn't pull these in.
Former-commit-id: 018a766df2c35868cb2d6e1e65c231b604fc7fda
|
2016-03-23 12:55:02 -05:00 |
|
Steve Harris
|
7700ae6f8b
|
Omaha #5088 - Moving NWS plugins to a new repository (AWIPS2_NWS)
Change-Id: I75818cfb4f5e45d0c6ce88c9b94a6cbd32c70397
Former-commit-id: b951fb20c5485371376d074ea672c0a7412390d3
|
2016-03-14 14:22:25 -05:00 |
|