Bryan Kowal
|
580172b47c
|
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]
Former-commit-id: f92eb59a73
|
2012-07-10 16:57:16 -05:00 |
|
Bryan Kowal
|
9a7d0492fe
|
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: a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]
Former-commit-id: b87b66abc5
|
2012-06-27 17:21:48 -05:00 |
|
Steve Harris
|
8367fb50f5
|
Revert "12.6.1-10 baseline"
This reverts commit b33c5bdfcf [formerly a2c0893d1a] [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]].
Former-commit-id: b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]
Former-commit-id: 25198a5cd6
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
b33c5bdfcf
|
12.6.1-10 baseline
Former-commit-id: ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]
Former-commit-id: a2c0893d1a
|
2012-06-21 08:38:48 -05:00 |
|
Bryan Kowal
|
1ee59eac71
|
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: f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]
Former-commit-id: f0e3b957e3
|
2012-06-18 11:16:28 -05:00 |
|
Steve Harris
|
a945ed8e6d
|
12.6.1-5 baseline
Former-commit-id: c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]
Former-commit-id: 8947efbc7f
|
2012-06-11 16:23:47 -05:00 |
|
Bryan Kowal
|
d92eb0c227
|
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: b8622629e3 [formerly 478e494673d498121cab732717f3fc399a0b0c03]
Former-commit-id: c0db02e377
|
2012-06-05 16:55:52 -05:00 |
|
Bryan Kowal
|
4dec6ced9f
|
Issue #450 - add the cave viz collaboration rpm to the yum groups.
Former-commit-id: 58b10dd9ae [formerly 56612b7cd64e16aa7af358ca251679a76781e36a]
Former-commit-id: 25c3f269bf
|
2012-04-11 10:28:30 -05:00 |
|
Steve Harris
|
dcdd7f0648
|
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: ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]
Former-commit-id: fee53dea94
|
2012-04-10 12:50:03 -05:00 |
|
Steve Harris
|
ce3b74c605
|
12.3.1-10 baseline
Former-commit-id: 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 22bd792cd9
|
2012-03-30 08:38:33 -05:00 |
|
Steve Harris
|
40d7357165
|
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: 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]
Former-commit-id: e5b56c99ab
|
2012-02-27 15:58:49 -06:00 |
|
Steve Harris
|
4450cf8963
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]
Former-commit-id: 54be9660f1
|
2012-02-22 11:14:43 -06:00 |
|
Bryan Kowal
|
e9d85fc09c
|
Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
Former-commit-id: 40c0e93995 [formerly 3038b2fc0d69236267db13eeb88e6f803cc6215a]
Former-commit-id: 7d21e3149e
|
2012-01-30 16:05:17 -06:00 |
|
Bryan Kowal
|
2745f9cac7
|
Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
Former-commit-id: 998337f9f4 [formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]
Former-commit-id: 2554090d0d
|
2012-01-30 16:01:45 -06:00 |
|
Bryan Kowal
|
6a07f850bd
|
Issue #18 - merging wes2bridge rpm changes into the git wes2bridge branch.
Former-commit-id: c08293a1dc [formerly 9df496bfe5fea08e8c2c11e5fadcc0d09bad125d]
Former-commit-id: bda5954b3c
|
2012-01-23 14:39:39 -06:00 |
|
Bryan Kowal
|
7f1b468010
|
Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: 65e1e4ee0b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]
Former-commit-id: ea1c82452b
|
2012-01-20 13:38:00 -06:00 |
|
Matt Nash
|
1faae42484
|
Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: c83e5ff474
|
2012-01-19 11:53:12 -06:00 |
|
root
|
3360eb6c5f
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 06a8b51d6d
|
2012-01-06 08:55:05 -06:00 |
|