Mirror of Unidata's AWIPS2.
Find a file
Dustin Johnson 31d7d09c10 Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 89583d97c8823818f87dc1a234078d85ba7bea4a
2012-11-01 13:36:06 -05:00
cave Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
cots Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts Issue #189 fix the grid deltaScripts to work with static data and fix rollback 2012-10-31 15:35:51 -05:00
edexOsgi Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
javaUtilities 12.11.1-4 baseline 2012-10-16 13:27:07 -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.6.1-9 baseline 2012-07-10 07:53:49 -05:00
MHSEmulator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
msi Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds 2012-08-21 16:17:58 -05:00
nativeLib Issue #1274 Added Token control for java code and scripts started by RFC Crons. 2012-10-31 21:20:40 -05:00
ncep Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
ost Issue #1257: Update PurgeRules to not be hard linked to path keys 2012-10-31 18:19:44 -05:00
pythonPackages 12.11.1-5 baseline 2012-10-18 15:46:42 -05:00
RadarServer Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
rpms Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tools 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
.gitignore Merge branch 'ss_sync' into 9-Wes2Bridge 2012-02-27 15:58:49 -06:00