root
0eb9520e15
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: 0987fc6b3dcb46f578790987fc6b3dcb46f578795a453ee9845a453ee984537dbadf648a66b2f2091792158ef8
2012-08-15 22:15:20 +00:00
Steve Harris
078b4fff3c
Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
rpms/awips2.64/Installer.h5py/component.spec
rpms/awips2.64/Installer.python/component.spec
rpms/awips2.64/Installer.python/src/lapack.patch1
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/python.site-packages/Installer.pupynere/component.spec
Former-commit-id: fb479341596d77b94217fb479341596d77b9421751e38ca88751e38ca887d2291ba23f3476fe755be892eb4628
2012-08-01 12:43:12 -05:00
Steve Harris
d3be09bd74
12.8.1-5 baseline
...
Former-commit-id: 2653ddc2e3fd2abfb6f12653ddc2e3fd2abfb6f1cd49ef3edacd49ef3edadab00b12e6e0c3722fd1e86949a8d3
2012-08-01 10:45:37 -05:00
Max Schenkelberg
9a1cd3b5e1
Issue #626 Moved data unzipper and wmo header remover to common so it can potentially be used by GOES-R
...
Amend: Added WMO header finder since the header property will have additional information in it when file comes from LDM. Also changed MessageGenerator to use new class for finding the wmo header
Amend: Added try-finally for input stream in DataUnzipper
Change-Id: I4ece2f5f24a429aa41969f51040a58e67e79e1c1
Former-commit-id: 7ace2035c5756988cb8b7ace2035c5756988cb8bb669f57ee4b669f57ee4864d6335a651f9666fcbe45c7f58ac
2012-07-27 14:42:36 -05:00
Bryan Kowal
fee2a4e419
Issue #802 - the baseline build (enhanced by WA8) will now correctly update the edex banner and cave about dialog. Improved how the edex banner is written.
...
Former-commit-id: b446253674db6b535eb6b446253674db6b535eb61e5b71ee7b1e5b71ee7b34a4f5807446198b0c92de1d59a174
2012-07-12 12:58:40 -05:00
Bryan Kowal
5b4c392e7f
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
...
Former-commit-id: c629f18f2499d22f395ac629f18f2499d22f395af92eb59a73f92eb59a738d64fdba2c580172b47c212afcceea
2012-07-10 16:57:16 -05:00
Steve Harris
c01b096242
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
...
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: c7024992a337793c86b1c7024992a337793c86b1d325d496f5d325d496f523c34c469acf3c7682133dd5b84aa2
2012-06-11 15:24:03 -05:00
Steve Harris
39ff9954f8
12.5.1-15 baseline
...
Former-commit-id: 8552902906b13cbb7e008552902906b13cbb7e003904c4ccf53904c4ccf597c4db937e676ea3192f9054c5ab6c
2012-06-08 13:39:48 -05:00
Steve Harris
f8ae79c35c
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: 24059a5b4e9b67525e9524059a5b4e9b67525e95e5b56c99abe5b56c99ab73a337bc3140d735716521f12bae82
2012-02-27 15:58:49 -06:00
David Gillingham
8efd012653
Issue #20 : Committing refactored archiver capability
...
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Issue #20 : Address peer review comments from previous commit.
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Former-commit-id: 535821e5b8bb1ac9959b535821e5b8bb1ac9959b061966f243061966f2433e42bc7d2d9f416558fa5a44726c19
2012-02-13 16:09:36 -06:00
Nate Jensen
90fdbcfea8
Issue #181 disable nctext-ingest
...
Change-Id: Ib376d7ebf435947898d5c84e8e31b83737760e3e
Former-commit-id: e61ff490b11b32446288e61ff490b11b32446288f3ba2258dff3ba2258df6bdb96c7ca50e735ce0c81e6aa8183
2012-01-31 09:45:27 -06:00
David Gillingham
e8d336e205
Issue #20 : Merge all changes from previous SVN repo to GIT.
...
Former-commit-id: b31f40ec9d845e6c19afb31f40ec9d845e6c19afb056e18757b056e18757ea7a55ad8d87b15de88bd85d78f180
2012-01-26 17:38:43 -06:00
Nate Jensen
532df5ba35
Issue #181 integrating ncep edex code
...
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3
Former-commit-id: 6366bc35cbfe52a35f7a6366bc35cbfe52a35f7a33756de9c833756de9c87301ad5c663b7a082f41ef5349fb63
2012-01-24 09:59:50 -06:00
Matt Nash
bcc32c10bc
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d766be3bec40580e2938d766be3bec40c83e5ff474c83e5ff47482300ccdcf1faae4248421d2361f00
2012-01-19 11:53:12 -06:00
root
e2ecdcfe33
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c9f19e3f712a02aeb236c9f19e3f71206a8b51d6d06a8b51d6d8e80217e593360eb6c5f377dcd10b9
2012-01-06 08:55:05 -06:00
