3 commits

Author	SHA1	Message	Date
Dustin Johnson	4222b24d09	Issue #1302 Address peer review comments for 5-Data_Delivery/development merge ... Amend: More peer review comments Restore PreferencesHandler Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7 Former-commit-id: 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d] Former-commit-id: 1dbeb22893	2012-11-08 09:57:16 -06:00
Dustin Johnson	bcf575966b	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: 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a] Former-commit-id: 31d7d09c10	2012-11-01 13:36:06 -05:00
Steve Harris	cbbdb231ce	12.11.1-4 baseline ... Former-commit-id: d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e] Former-commit-id: 6958b861f0	2012-10-16 13:27:07 -05:00