Steve Harris
|
7be572b27d
|
Merge branch 'ss_builds' (12.11.1-2) into development
Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73
Former-commit-id: 0895f22690 [formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]
Former-commit-id: 8c97afe03b
|
2012-10-08 13:29:34 -05:00 |
|
Steve Harris
|
75901860c2
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 1e02387ff1 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]
Former-commit-id: c12ee14e66
|
2012-10-08 13:26:20 -05:00 |
|
Steve Harris
|
961e000592
|
Issue #1250 - Modified the comp.xml files adding kml-export
Change-Id: I53bcbf3199013f02db1ea83c5e665912d6232761
Former-commit-id: 9552a60f54 [formerly 252fbc2ff9e34300c2176a6c149c3af9a523321c]
Former-commit-id: d0c760764f
|
2012-10-05 10:06:16 -05:00 |
|
Steve Harris
|
de1639aea2
|
12.10.1-3 baseline
Former-commit-id: 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]
Former-commit-id: 21f430062b
|
2012-09-11 16:00:38 -05:00 |
|
Bryan Kowal
|
35aff16e89
|
Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 3e1556a981 [formerly 9a0cd58382909965a6c44cf05fec28eb69835a26]
Former-commit-id: 137b27d3ff
|
2012-09-05 14:44:36 -05:00 |
|
Steve Harris
|
a1d931fd44
|
12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
9e2d161f8d
|
Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
rpms/awips2.64/Installer.h5py/component.spec
Former-commit-id: 85f82b18b3 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]
Former-commit-id: f0b7d5e4c5
|
2012-08-06 09:38:26 -05:00 |
|
Steve Harris
|
6244359a80
|
12.8.1-10 baseline
Former-commit-id: ca25d508ec [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]
Former-commit-id: b5e8fee24d
|
2012-08-06 09:34:26 -05:00 |
|
Steve Harris
|
07c40a9c0c
|
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: 587bb6a274 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]
Former-commit-id: 56249c2611
|
2012-07-27 14:44:44 -05:00 |
|
Steve Harris
|
11f96dbedd
|
12.7.1-8 baseline
Former-commit-id: c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]
Former-commit-id: 16bf591a33
|
2012-07-19 16:20:40 -05:00 |
|
Bryan Kowal
|
c629f18f24
|
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: f92eb59a73 [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]
Former-commit-id: 99d22f395a
|
2012-07-10 16:57:16 -05:00 |
|
Steve Harris
|
7c064b6868
|
12.6.1-9 baseline
Former-commit-id: 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]
Former-commit-id: 2c0ff851ca
|
2012-07-10 07:53:49 -05:00 |
|
Bryan Kowal
|
b1b294c401
|
Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
edexOsgi/build.edex/deploy-install.xml
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.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
rpms/awips2-rpm.db
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]
Former-commit-id: a33740e915
|
2012-06-27 17:21:48 -05:00 |
|
Steve Harris
|
62cf6a9f92
|
Revert "12.6.1-10 baseline"
This reverts commit 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]].
Former-commit-id: 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]
Former-commit-id: b4b1f6975f
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
06f1c7b73c
|
12.6.1-10 baseline
Former-commit-id: a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]
Former-commit-id: ddde63eee0
|
2012-06-21 08:38:48 -05:00 |
|
Bryan Kowal
|
9361f3eb94
|
Merge branch '11-Collaboration' into development
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: f0e3b957e3 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]
Former-commit-id: f528e10391
|
2012-06-18 11:16:28 -05:00 |
|
Steve Harris
|
09f73b0601
|
12.6.1-5 baseline
Former-commit-id: 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]
Former-commit-id: c99afab05f
|
2012-06-11 16:23:47 -05:00 |
|
Bryan Kowal
|
3478f30891
|
Issue #691 - All scripts, directories that used to include wes2bridge in the name have been renamed to edex-environment. The edex wes2bridge rpm has been renamed to the awips2-edex-environment rpm.
Former-commit-id: c0db02e377 [formerly 478e494673d498121cab732717f3fc399a0b0c03]
Former-commit-id: b8622629e3
|
2012-06-05 16:55:52 -05:00 |
|
Bryan Kowal
|
b561cc5c85
|
Issue #450 - add the cave viz collaboration rpm to the yum groups.
Former-commit-id: 25c3f269bf [formerly 56612b7cd64e16aa7af358ca251679a76781e36a]
Former-commit-id: 58b10dd9ae
|
2012-04-11 10:28:30 -05:00 |
|
Steve Harris
|
c90ce9d54e
|
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: fee53dea94 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]
Former-commit-id: ed26e06df2
|
2012-04-10 12:50:03 -05:00 |
|
Steve Harris
|
0e4128712b
|
12.3.1-10 baseline
Former-commit-id: 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 4068f5295f
|
2012-03-30 08:38:33 -05:00 |
|
Steve Harris
|
24059a5b4e
|
Merge branch 'ss_sync' into 9-Wes2Bridge
Conflicts:
.gitignore
ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
deleted h5 files
using ss_sync version of java files
Former-commit-id: e5b56c99ab [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]
Former-commit-id: 9b67525e95
|
2012-02-27 15:58:49 -06:00 |
|
Steve Harris
|
8da36046de
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]
Former-commit-id: c8aae98741
|
2012-02-22 11:14:43 -06:00 |
|
Bryan Kowal
|
00c0ab406b
|
Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
Former-commit-id: 7d21e3149e [formerly 3038b2fc0d69236267db13eeb88e6f803cc6215a]
Former-commit-id: 40c0e93995
|
2012-01-30 16:05:17 -06:00 |
|
Bryan Kowal
|
b6a8534258
|
Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
Former-commit-id: 2554090d0d [formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]
Former-commit-id: 998337f9f4
|
2012-01-30 16:01:45 -06:00 |
|
Bryan Kowal
|
a37509adf3
|
Issue #18 - merging wes2bridge rpm changes into the git wes2bridge branch.
Former-commit-id: bda5954b3c [formerly 9df496bfe5fea08e8c2c11e5fadcc0d09bad125d]
Former-commit-id: c08293a1dc
|
2012-01-23 14:39:39 -06:00 |
|
Bryan Kowal
|
4453ad2d10
|
Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: ea1c82452b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]
Former-commit-id: 65e1e4ee0b
|
2012-01-20 13:38:00 -06:00 |
|
Matt Nash
|
580e2938d7
|
Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
|
2012-01-19 11:53:12 -06:00 |
|
root
|
a02aeb236c
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
|
2012-01-06 08:55:05 -06:00 |
|