Commit graph

9 commits

Author SHA1 Message Date
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
David Gillingham
9f416558fa 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 47750dfd5e387238f409ead55549cbb24f5afbe1]
Former-commit-id: 061966f243
2012-02-13 16:09:36 -06:00
Nate Jensen
50e735ce0c Issue #181 disable nctext-ingest
Change-Id: Ib376d7ebf435947898d5c84e8e31b83737760e3e

Former-commit-id: 1b32446288 [formerly a54d4b8e55c23411c0cb61eae8f57e8279c9f8e9]
Former-commit-id: f3ba2258df
2012-01-31 09:45:27 -06:00
David Gillingham
87b15de88b Issue #20: Merge all changes from previous SVN repo to GIT.
Former-commit-id: 845e6c19af [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]
Former-commit-id: b056e18757
2012-01-26 17:38:43 -06:00
Dave Hladky
2d53cfbe41 Issue #15 Wes2Bridge time settings
Former-commit-id: 594412a5b5 [formerly 61cb464263b06c01f4ea0b7270628f03e9e48d5a]
Former-commit-id: b03b324ead
2012-01-25 10:53:51 -06:00
Nate Jensen
3b7a082f41 Issue #181 integrating ncep edex code
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3

Former-commit-id: fe52a35f7a [formerly 3aa13bd49e23ef963127f7efbc91054c06808f1c]
Former-commit-id: 33756de9c8
2012-01-24 09:59:50 -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