Steve Harris
|
51bb9ebb46
|
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 fee53dea94 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]
Former-commit-id: fee53dea94
Former-commit-id: dcdd7f0648
|
2012-04-10 12:50:03 -05:00 |
|
Steve Harris
|
8bc60b1e32
|
12.3.1-10 baseline
Former-commit-id: 0e4128712b [formerly 4068f5295f ] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 22bd792cd9
Former-commit-id: ce3b74c605
|
2012-03-30 08:38:33 -05:00 |
|
Steve Harris
|
73a337bc31
|
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 e5b56c99ab [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]
Former-commit-id: e5b56c99ab
Former-commit-id: 40d7357165
|
2012-02-27 15:58:49 -06:00 |
|
Steve Harris
|
b55a488ed8
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 8da36046de [formerly c8aae98741 ] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
|
2012-02-22 11:14:43 -06:00 |
|
Bryan Kowal
|
e17a1e06a7
|
Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
Former-commit-id: 00c0ab406b [formerly 40c0e93995 ] [formerly 7d21e3149e [formerly 3038b2fc0d69236267db13eeb88e6f803cc6215a]]
Former-commit-id: 7d21e3149e
Former-commit-id: e9d85fc09c
|
2012-01-30 16:05:17 -06:00 |
|
Bryan Kowal
|
b271da085c
|
Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
Former-commit-id: b6a8534258 [formerly 998337f9f4 ] [formerly 2554090d0d [formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]]
Former-commit-id: 2554090d0d
Former-commit-id: 2745f9cac7
|
2012-01-30 16:01:45 -06:00 |
|
Bryan Kowal
|
886b054204
|
Issue #18 - merging wes2bridge rpm changes into the git wes2bridge branch.
Former-commit-id: a37509adf3 [formerly c08293a1dc ] [formerly bda5954b3c [formerly 9df496bfe5fea08e8c2c11e5fadcc0d09bad125d]]
Former-commit-id: bda5954b3c
Former-commit-id: 6a07f850bd
|
2012-01-23 14:39:39 -06:00 |
|
Bryan Kowal
|
9f6780c4dd
|
Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: 4453ad2d10 [formerly 65e1e4ee0b ] [formerly ea1c82452b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]
Former-commit-id: ea1c82452b
Former-commit-id: 7f1b468010
|
2012-01-20 13:38:00 -06:00 |
|
Matt Nash
|
82300ccdcf
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40 ] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
|
2012-01-19 11:53:12 -06:00 |
|
root
|
8e80217e59
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712 ] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
|
2012-01-06 08:55:05 -06:00 |
|