Bryan Kowal
|
f0e3b957e3
|
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: 9e117e495d669e310839bc9ff8e1e8207b03491b
|
2012-06-18 11:16:28 -05:00 |
|
Bryan Kowal
|
c0db02e377
|
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: 478e494673d498121cab732717f3fc399a0b0c03
|
2012-06-05 16:55:52 -05:00 |
|
Bryan Kowal
|
25c3f269bf
|
Issue #450 - add the cave viz collaboration rpm to the yum groups.
Former-commit-id: 56612b7cd64e16aa7af358ca251679a76781e36a
|
2012-04-11 10:28:30 -05:00 |
|
Steve Harris
|
fee53dea94
|
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: 3bd9b3a16b0105822983302efa5dd2834aaf5a5f
|
2012-04-10 12:50:03 -05:00 |
|
Steve Harris
|
22bd792cd9
|
12.3.1-10 baseline
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
|
2012-03-30 08:38:33 -05:00 |
|
Steve Harris
|
e5b56c99ab
|
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: fb9d0adece5806382d0aa5c7c3e7c41f89594143
|
2012-02-27 15:58:49 -06:00 |
|
Steve Harris
|
54be9660f1
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
|
2012-02-22 11:14:43 -06:00 |
|
Bryan Kowal
|
7d21e3149e
|
Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
Former-commit-id: 3038b2fc0d69236267db13eeb88e6f803cc6215a
|
2012-01-30 16:05:17 -06:00 |
|
Bryan Kowal
|
2554090d0d
|
Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
Former-commit-id: bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462
|
2012-01-30 16:01:45 -06:00 |
|
Bryan Kowal
|
bda5954b3c
|
Issue #18 - merging wes2bridge rpm changes into the git wes2bridge branch.
Former-commit-id: 9df496bfe5fea08e8c2c11e5fadcc0d09bad125d
|
2012-01-23 14:39:39 -06:00 |
|
Bryan Kowal
|
ea1c82452b
|
Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: 56068aa96fa6daf113861476bf4b7aebe2021ca4
|
2012-01-20 13:38:00 -06:00 |
|
Matt Nash
|
c83e5ff474
|
Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
|
2012-01-19 11:53:12 -06:00 |
|
root
|
06a8b51d6d
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|