7 commits

Author	SHA1	Message	Date
Steve Harris	23c34c469a	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: c7024992a3 [formerly 37793c86b1] [formerly d325d496f5 [formerly a435e6464a78345b5036e3060430375dc53e4faf]] Former-commit-id: d325d496f5 Former-commit-id: cf3c768213	2012-06-11 15:24:03 -05:00
Steve Harris	97c4db937e	12.5.1-15 baseline ... Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]] Former-commit-id: 3904c4ccf5 Former-commit-id: 676ea3192f	2012-06-08 13:39:48 -05:00
Steve Harris	53d2822329	Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge ... Conflicts: ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java All of these were 'self-resolved' when kdiff3 invoked Former-commit-id: d7f7c26582 [formerly 092efd6072] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]] Former-commit-id: 31b3e87ffa Former-commit-id: 98447412f8	2012-05-09 13:19:47 -05:00
Richard Peter	ae35c2f27c	Issue #538: Fix Serialization Annotations and Serialization Issues ... Change-Id: I436997106438ab283e987cb7e3055fcee009b608 Former-commit-id: c33a392a8c [formerly 349adaeedd] [formerly b11df888d3 [formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]] Former-commit-id: b11df888d3 Former-commit-id: e3323febc5	2012-04-27 12:08:29 -05:00
Steve Harris	a2a6a18fae	12.4.1-4 baseline ... Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]] Former-commit-id: 2a216f333c Former-commit-id: a4e519f3cd	2012-04-18 15:18:16 -05:00
Nate Jensen	802607c79f	Issue #181 fixing edex feature and component deploys ... Change-Id: Id7bad29c6914b13b3a6f47452f772999b696f48d Former-commit-id: fae8fd5a6d [formerly 8e3730adbf] [formerly 1dabb12dce [formerly 0c82def5c753aab240848aac8dc906a161461ac3]] Former-commit-id: 1dabb12dce Former-commit-id: 9c4ad58867	2012-01-24 12:15:01 -06:00
Nate Jensen	ba529c4a12	Issue #181 integrating ncep edex code ... Change-Id: I7f3fd64d1e21d5a82b29b404bb90a62bfa6f79bf Former-commit-id: 873469f771 [formerly f96e6a822b] [formerly a015cc136b [formerly 71d87e07ef1d5ce2509fddce9170870a5950ba7b]] Former-commit-id: a015cc136b Former-commit-id: e951995736	2012-01-24 09:49:27 -06:00