Steve Harris
84d0f1fbb6
Merge branch 'master' (OB12.7.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
cave/com.raytheon.uf.viz.points/.classpath
cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
deltaScripts/.pydevproject
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.climo/.classpath
edexOsgi/com.raytheon.uf.common.climo/.project
edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
edexOsgi/com.raytheon.uf.common.hlstopo/.project
edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
edexOsgi/com.raytheon.uf.common.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
edexOsgi/com.raytheon.uf.edex.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
rpms/awips2-rpm.db
rpms/awips2.core/Installer.gfe/component.spec
rpms/awips2.core/Installer.ldm/component.spec
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
rpms/awips2.core/Installer.rcm/scripts/conf/start-config
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/release/buildCoreRPMs.sh
rpms/common/yum/arch.x86/comps.xml
tools/devAutoDeploy/devAutoDeploy.ecl
Former-commit-id: 07c40a9c0c56249c261107c40a9c0c56249c2611587bb6a274587bb6a2749e4df423262aa4114e4dd7540c958f
2012-07-27 14:44:44 -05:00
Steve Harris
36e2ad3023
12.7.1-8 baseline
...
Former-commit-id: 11f96dbedd16bf591a3311f96dbedd16bf591a33c42ae0fa39c42ae0fa39f2102bfb249f971829649aabe438b9
2012-07-19 16:20:40 -05:00
Nate Jensen
0c0efee61a
Issue #716 fix uamend script
...
Change-Id: I663c5dce55a0f7b3f2cd128b526d1d211ad096e7
Former-commit-id: cf7dfdb0448ee0eb7091cf7dfdb0448ee0eb7091a9ddd4f194a9ddd4f194a5e636a590b5bb04abaf4e9d712877
2012-06-29 13:10:35 -05:00
Nate Jensen
b3cce25243
Issue #716 only print mergetool message if it's not set
...
Change-Id: I7a2e56e58dff3b6b2dcc65a734767d2c707882b8
Former-commit-id: 566280332f76382d8ccd566280332f76382d8ccd1e761b67161e761b6716fb7755cc043fe0f033072226e17a80
2012-06-28 16:16:26 -05:00
Steve Harris
c2a1dd7f1b
Issue #708 - execute permissions didn't survive the git push
...
Former-commit-id: 4d2baf48d9aa46aa37134d2baf48d9aa46aa3713a2c88aee12a2c88aee12927fd978b4bc15e39e5ea9dafc2233
2012-06-22 12:08:20 -05:00
Steve Harris
918766b587
Issue #708 - new script for setting up Gerrit hook and aliases
...
Change-Id: Iabdc5005ed9376e31414429a76898c0798d8e7ff
Former-commit-id: 48faf25841492e6fe37948faf25841492e6fe379209299d1cb209299d1cb09e2faee722a31a4c3e9a48615c40d
2012-06-22 11:39:00 -05:00
Steve Harris
0c25458510
12.4.1-10 baseline
...
Former-commit-id: 4bfbdad17d9f8cb727a54bfbdad17d9f8cb727a58485b90ff88485b90ff833a67cdd82a28d70b5c5e5543a0e86
2012-05-01 18:06:13 -05:00
Ben Steffensmeier
f6b65b8467
Issue #228 change plots, grid icons, and radar icons
...
to use a new PointImageExtension which provides an
interface for drawing images at a single point,
which kml can use to extract plot images.
Change-Id: I29b07ed4f9e8ea95ed131ab1eb3ca27efadaf0e2
Former-commit-id: 792dc75f4dd976603262792dc75f4dd97660326213a99abe7b13a99abe7bec90cad81063ef10314570e38a4506
2012-02-01 12:45:56 -06:00
Matt Nash
d4dc4809c4
Issue #192 remove cave directory in tools for 4
...
Former-commit-id: 2d67a6c2c0f2b5a637a82d67a6c2c0f2b5a637a8f0801c269df0801c269d3092407a14080e786ca88d2422cf8c
2012-01-25 09:40:00 -06:00
Matt Nash
bcc32c10bc
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d766be3bec40580e2938d766be3bec40c83e5ff474c83e5ff47482300ccdcf1faae4248421d2361f00
2012-01-19 11:53:12 -06:00
root
e2ecdcfe33
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c9f19e3f712a02aeb236c9f19e3f71206a8b51d6d06a8b51d6d8e80217e593360eb6c5f377dcd10b9
2012-01-06 08:55:05 -06:00
