Steve Harris
|
21f12bae82
|
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 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]
Former-commit-id: e5b56c99ab
Former-commit-id: 40d7357165
|
2012-02-27 15:58:49 -06:00 |
|
Steve Harris
|
32fa2a28c5
|
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: c502603907 [formerly c502603907 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]
Former-commit-id: ecb38ba165
Former-commit-id: a9b900821a
|
2012-02-23 12:45:50 -06:00 |
|
Steve Harris
|
37e57b6588
|
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: b89ebc5e01 [formerly b89ebc5e01 [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]
Former-commit-id: 496cc6a06b
Former-commit-id: 4a93298877
|
2012-02-20 16:38:06 -06:00 |
|
David Gillingham
|
5a44726c19
|
Issue #20: Committing refactored archiver capability
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Issue #20: Address peer review comments from previous commit.
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Former-commit-id: bb1ac9959b [formerly bb1ac9959b [formerly 47750dfd5e387238f409ead55549cbb24f5afbe1]]
Former-commit-id: 061966f243
Former-commit-id: 9f416558fa
|
2012-02-13 16:09:36 -06:00 |
|
Matt Nash
|
1cde55048e
|
Issue #192 gitignore changes
Former-commit-id: 5fdadf4333 [formerly 5fdadf4333 [formerly 68f511221d4b198be50e1cf2a81723b8c3578a61]]
Former-commit-id: 426da850d3
Former-commit-id: 380179f10d
|
2012-02-03 15:03:21 -06:00 |
|
David Gillingham
|
d85d78f180
|
Issue #20: Merge all changes from previous SVN repo to GIT.
Former-commit-id: 845e6c19af [formerly 845e6c19af [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]
Former-commit-id: b056e18757
Former-commit-id: 87b15de88b
|
2012-01-26 17:38:43 -06:00 |
|
Matt Nash
|
21d2361f00
|
Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
|
2012-01-19 11:53:12 -06:00 |
|