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: 07c40a9c0c [formerly 56249c2611] [formerly 07c40a9c0c [formerly 56249c2611] [formerly 587bb6a274 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]
Former-commit-id: 587bb6a274
Former-commit-id: 9e4df42326 [formerly 2aa4114e4d]
Former-commit-id: d7540c958f
|
2012-07-27 14:44:44 -05:00 |
|
Steve Harris
|
36e2ad3023
|
12.7.1-8 baseline
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: f2102bfb24 [formerly 9f97182964]
Former-commit-id: 9aabe438b9
|
2012-07-19 16:20:40 -05:00 |
|
Bryan Kowal
|
5b4c392e7f
|
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: c629f18f24 [formerly 99d22f395a] [formerly c629f18f24 [formerly 99d22f395a] [formerly f92eb59a73 [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]]
Former-commit-id: f92eb59a73
Former-commit-id: 8d64fdba2c [formerly 580172b47c]
Former-commit-id: 212afcceea
|
2012-07-10 16:57:16 -05:00 |
|
Steve Harris
|
37f2b6e138
|
12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443 [formerly 4f7bb90bb0]
Former-commit-id: d5fa61041b
|
2012-07-10 07:53:49 -05:00 |
|
Bryan Kowal
|
2e5a850d28
|
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: b1b294c401 [formerly a33740e915] [formerly b1b294c401 [formerly a33740e915] [formerly b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]
Former-commit-id: b87b66abc5
Former-commit-id: b4917e6708 [formerly 9a7d0492fe]
Former-commit-id: 611925412d
|
2012-06-27 17:21:48 -05:00 |
|
Steve Harris
|
e77a15c047
|
Revert "12.6.1-10 baseline"
This reverts commit 95e7f4fc0c [formerly aecc6a8474] [formerly f8497470fc [formerly b33c5bdfcf]] [formerly a2c0893d1a] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]].
Former-commit-id: 62cf6a9f92 [formerly b4b1f6975f] [formerly 62cf6a9f92 [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 333fd9c64e [formerly 8367fb50f5]
Former-commit-id: 75f77df418
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
95e7f4fc0c
|
12.6.1-10 baseline
Former-commit-id: 06f1c7b73c [formerly ddde63eee0] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]
Former-commit-id: a2c0893d1a
Former-commit-id: f8497470fc [formerly b33c5bdfcf]
Former-commit-id: aecc6a8474
|
2012-06-21 08:38:48 -05:00 |
|
Bryan Kowal
|
a6d1f97dec
|
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: 9361f3eb94 [formerly f528e10391] [formerly 9361f3eb94 [formerly f528e10391] [formerly f0e3b957e3 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]
Former-commit-id: f0e3b957e3
Former-commit-id: 21e8618852 [formerly 1ee59eac71]
Former-commit-id: cbc8964e5b
|
2012-06-18 11:16:28 -05:00 |
|
Steve Harris
|
3b468d9f50
|
12.6.1-5 baseline
Former-commit-id: 09f73b0601 [formerly c99afab05f] [formerly 09f73b0601 [formerly c99afab05f] [formerly 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]
Former-commit-id: 8947efbc7f
Former-commit-id: b69fa75919 [formerly a945ed8e6d]
Former-commit-id: 91e65230ad
|
2012-06-11 16:23:47 -05:00 |
|
Bryan Kowal
|
89a427c142
|
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: 3478f30891 [formerly b8622629e3] [formerly 3478f30891 [formerly b8622629e3] [formerly c0db02e377 [formerly 478e494673d498121cab732717f3fc399a0b0c03]]]
Former-commit-id: c0db02e377
Former-commit-id: 733b34202f [formerly d92eb0c227]
Former-commit-id: 2b48d12f7c
|
2012-06-05 16:55:52 -05:00 |
|
Bryan Kowal
|
7abc0980b4
|
Issue #450 - add the cave viz collaboration rpm to the yum groups.
Former-commit-id: b561cc5c85 [formerly 58b10dd9ae] [formerly b561cc5c85 [formerly 58b10dd9ae] [formerly 25c3f269bf [formerly 56612b7cd64e16aa7af358ca251679a76781e36a]]]
Former-commit-id: 25c3f269bf
Former-commit-id: 30c2ed6fed [formerly 4dec6ced9f]
Former-commit-id: f0524db48b
|
2012-04-11 10:28:30 -05:00 |
|
Steve Harris
|
f51d290333
|
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: c90ce9d54e [formerly ed26e06df2] [formerly c90ce9d54e [formerly ed26e06df2] [formerly fee53dea94 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]
Former-commit-id: fee53dea94
Former-commit-id: 51bb9ebb46 [formerly dcdd7f0648]
Former-commit-id: 58cb18d860
|
2012-04-10 12:50:03 -05:00 |
|
Steve Harris
|
293563cfe7
|
12.3.1-10 baseline
Former-commit-id: 0e4128712b [formerly 4068f5295f] [formerly 0e4128712b [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 8bc60b1e32 [formerly ce3b74c605]
Former-commit-id: 2e0f4b241b
|
2012-03-30 08:38:33 -05:00 |
|
Steve Harris
|
f8ae79c35c
|
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: 24059a5b4e [formerly 9b67525e95] [formerly 24059a5b4e [formerly 9b67525e95] [formerly e5b56c99ab [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 73a337bc31 [formerly 40d7357165]
Former-commit-id: 21f12bae82
|
2012-02-27 15:58:49 -06:00 |
|
Steve Harris
|
978d22db50
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 8da36046de [formerly c8aae98741] [formerly 8da36046de [formerly c8aae98741] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]
Former-commit-id: 54be9660f1
Former-commit-id: b55a488ed8 [formerly 4450cf8963]
Former-commit-id: 15c56d11bc
|
2012-02-22 11:14:43 -06:00 |
|
Bryan Kowal
|
985111384a
|
Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
Former-commit-id: 00c0ab406b [formerly 40c0e93995] [formerly 00c0ab406b [formerly 40c0e93995] [formerly 7d21e3149e [formerly 3038b2fc0d69236267db13eeb88e6f803cc6215a]]]
Former-commit-id: 7d21e3149e
Former-commit-id: e17a1e06a7 [formerly e9d85fc09c]
Former-commit-id: 4c691bcbfb
|
2012-01-30 16:05:17 -06:00 |
|
Bryan Kowal
|
1c9ee91f6c
|
Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
Former-commit-id: b6a8534258 [formerly 998337f9f4] [formerly b6a8534258 [formerly 998337f9f4] [formerly 2554090d0d [formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]]]
Former-commit-id: 2554090d0d
Former-commit-id: b271da085c [formerly 2745f9cac7]
Former-commit-id: bafb26c8be
|
2012-01-30 16:01:45 -06:00 |
|
Bryan Kowal
|
079f58f996
|
Issue #18 - merging wes2bridge rpm changes into the git wes2bridge branch.
Former-commit-id: a37509adf3 [formerly c08293a1dc] [formerly a37509adf3 [formerly c08293a1dc] [formerly bda5954b3c [formerly 9df496bfe5fea08e8c2c11e5fadcc0d09bad125d]]]
Former-commit-id: bda5954b3c
Former-commit-id: 886b054204 [formerly 6a07f850bd]
Former-commit-id: f3e97815fe
|
2012-01-23 14:39:39 -06:00 |
|
Bryan Kowal
|
bb662ca175
|
Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: 4453ad2d10 [formerly 65e1e4ee0b] [formerly 4453ad2d10 [formerly 65e1e4ee0b] [formerly ea1c82452b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]]
Former-commit-id: ea1c82452b
Former-commit-id: 9f6780c4dd [formerly 7f1b468010]
Former-commit-id: dafb6b18d8
|
2012-01-20 13:38:00 -06:00 |
|
Matt Nash
|
bcc32c10bc
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484]
Former-commit-id: 21d2361f00
|
2012-01-19 11:53:12 -06:00 |
|
root
|
e2ecdcfe33
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
|
2012-01-06 08:55:05 -06:00 |
|