Steve Harris
|
9b67525e95
|
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
|
c8aae98741
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
94c2ea985b
|
Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: a04c1c31c89566279953d2a270df8d652a3a82ff
|
2012-02-22 10:12:49 -06:00 |
|
Steve Harris
|
b89ebc5e01
|
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: 85082f273a85a3967d54d4a489b6ea973d0688be
|
2012-02-20 16:38:06 -06:00 |
|
Steve Harris
|
93f6535bd8
|
Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 0ccca40d35e50072218a1da1db474075f8ad0393
|
2012-02-17 10:55:02 -06:00 |
|
David Gillingham
|
bb1ac9959b
|
Issue #20: Committing refactored archiver capability
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Issue #20: Address peer review comments from previous commit.
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Former-commit-id: 47750dfd5e387238f409ead55549cbb24f5afbe1
|
2012-02-13 16:09:36 -06:00 |
|
David Gillingham
|
845e6c19af
|
Issue #20: Merge all changes from previous SVN repo to GIT.
Former-commit-id: 926a2a6a5af5b3514c29097deb0fc24b093643a2
|
2012-01-26 17:38:43 -06:00 |
|
Nate Jensen
|
ca923b9475
|
Issue #181 fix ncep
Change-Id: If0e2947c33523ada50036212666867a7c5138c17
Former-commit-id: 8d7433be62e5b815d012b330c31fe069db16b5b4
|
2012-01-26 17:28:06 -06:00 |
|
Roger Ferrel
|
472e788dba
|
Issue #181
new files not indexed
Former-commit-id: 6e2032f9290e77e8e597ae4256ffe7ad8142407b
|
2012-01-26 14:37:19 -06:00 |
|
Roger Ferrel
|
f00f3dd332
|
Issue #181
The January ncep_build/build.cave changes
Former-commit-id: 29b4a3313d4cefd56f9697a31a767a9780de75a1
|
2012-01-26 11:25:39 -06:00 |
|
Roger Ferrel
|
7427aeaf29
|
Issue #181
Changes from January ncep_cave
Former-commit-id: 6a878c3c5f400c53d39d7920c0619362aaafb946
|
2012-01-26 09:26:07 -06:00 |
|
Dave Hladky
|
594412a5b5
|
Issue #15 Wes2Bridge time settings
Former-commit-id: 61cb464263b06c01f4ea0b7270628f03e9e48d5a
|
2012-01-25 10:53:51 -06:00 |
|
Nate Jensen
|
fe52a35f7a
|
Issue #181 integrating ncep edex code
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3
Former-commit-id: 3aa13bd49e23ef963127f7efbc91054c06808f1c
|
2012-01-24 09:59:50 -06:00 |
|
Bryan Kowal
|
2142afe3f1
|
Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 296d2915b17f0086d93e200d4780663bff34edbb
|
2012-01-20 11:37:38 -06:00 |
|
Matt Nash
|
66be3bec40
|
Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
|
2012-01-19 11:53:12 -06:00 |
|
root
|
9f19e3f712
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|