Commit graph

18 commits

Author SHA1 Message Date
Steve Harris
7bdde9f690 Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
Former-commit-id: 5bbf80a384 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]
Former-commit-id: 10dc140747
2012-03-12 13:10:34 -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
Steve Harris
aaead73ec5 Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]
Former-commit-id: 9995d22e25
2012-02-22 10:12:49 -06:00
Steve Harris
4a93298877 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 85082f273a85a3967d54d4a489b6ea973d0688be]
Former-commit-id: 496cc6a06b
2012-02-20 16:38:06 -06:00
Steve Harris
65b22abd24 Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]
Former-commit-id: b137302802
2012-02-17 10:55:02 -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
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
Nate Jensen
29be9b82bd Issue #181 fix ncep
Change-Id: If0e2947c33523ada50036212666867a7c5138c17

Former-commit-id: ca923b9475 [formerly 8d7433be62e5b815d012b330c31fe069db16b5b4]
Former-commit-id: 15e0a5e68d
2012-01-26 17:28:06 -06:00
Roger Ferrel
c6f2b90560 Issue #181
new files not indexed


Former-commit-id: 472e788dba [formerly 6e2032f9290e77e8e597ae4256ffe7ad8142407b]
Former-commit-id: 69f8daedff
2012-01-26 14:37:19 -06:00
Roger Ferrel
cbd8827872 Issue #181
The January ncep_build/build.cave changes

Former-commit-id: f00f3dd332 [formerly 29b4a3313d4cefd56f9697a31a767a9780de75a1]
Former-commit-id: 750b17a81c
2012-01-26 11:25:39 -06:00
Roger Ferrel
376f6868b6 Issue #181
Changes from January ncep_cave

Former-commit-id: 7427aeaf29 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]
Former-commit-id: fa42f2dc60
2012-01-26 09:26:07 -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
mpduff
5deccb8bf5 Issue #16 - data/manual now uses subdirectories
Change-Id: I19786d4a39b2f7363b9eccd3ef00cd2ddf7d46fb
Former-commit-id: 59c8cbf1f3 [formerly 3619411519db0fe5df90e47ca478f083931817ec]
Former-commit-id: 24efc2ee93
2012-01-24 12:27:11 -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
Bryan Kowal
2a7b92ec91 Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 2142afe3f1 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]
Former-commit-id: 2b5ee4b940
2012-01-20 11:37:38 -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