xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1411 commits 31 branches 40 tags 3.8 GiB
Commit graph

7 commits

Author SHA1 Message Date
Steve Harris
cf3c768213 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: 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]
Former-commit-id: d325d496f5
 2012-06-11 15:24:03 -05:00
Steve Harris
676ea3192f 12.5.1-15 baseline 
Former-commit-id: b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: 3904c4ccf5
 2012-06-08 13:39:48 -05:00
Steve Harris
98447412f8 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: 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]
Former-commit-id: 31b3e87ffa
 2012-05-09 13:19:47 -05:00
Richard Peter
e3323febc5 Issue #538: Fix Serialization Annotations and Serialization Issues 
Change-Id: I436997106438ab283e987cb7e3055fcee009b608

Former-commit-id: 349adaeedd [formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]
Former-commit-id: b11df888d3
 2012-04-27 12:08:29 -05:00
Steve Harris
a4e519f3cd 12.4.1-4 baseline 
Former-commit-id: 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 2a216f333c
 2012-04-18 15:18:16 -05:00
Nate Jensen
9c4ad58867 Issue #181 fixing edex feature and component deploys 
Change-Id: Id7bad29c6914b13b3a6f47452f772999b696f48d

Former-commit-id: 8e3730adbf [formerly 0c82def5c753aab240848aac8dc906a161461ac3]
Former-commit-id: 1dabb12dce
 2012-01-24 12:15:01 -06:00
Nate Jensen
e951995736 Issue #181 integrating ncep edex code 
Change-Id: I7f3fd64d1e21d5a82b29b404bb90a62bfa6f79bf

Former-commit-id: f96e6a822b [formerly 71d87e07ef1d5ce2509fddce9170870a5950ba7b]
Former-commit-id: a015cc136b
 2012-01-24 09:49:27 -06:00