Mirror of Unidata's AWIPS2.
Find a file
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
cave Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge 2012-06-11 15:24:03 -05:00
cots 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge 2012-06-11 15:24:03 -05:00
edexOsgi Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge 2012-06-11 15:24:03 -05:00
javaUtilities Issue #691 - All scripts, directories that used to include wes2bridge in the name have been renamed to edex-environment. The edex wes2bridge rpm has been renamed to the awips2-edex-environment rpm. 2012-06-05 16:55:52 -05:00
ldm 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
MHSEmulator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
msi 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
nativeLib 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
ncep Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge 2012-06-11 15:24:03 -05:00
pythonPackages Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge 2012-06-11 15:24:03 -05:00
RadarServer 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
rpms Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge 2012-06-11 15:24:03 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tools 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
.gitignore Merge branch 'ss_sync' into 9-Wes2Bridge 2012-02-27 15:58:49 -06:00
after.txt 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
after_purge.out 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
before.txt 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
before_purge.out 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
dim.txt 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
GribSpatialCache.java 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
PurgeDao.java 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
purgedir.txt 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
PurgeJob.java 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
PurgeManager.java 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
TextDao.java 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00