Mirror of Unidata's AWIPS2.

Steve Harris 7e7529e482 CM-MERGE:14.1.3-2,-3 into 14.2.2 ... Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14) Conflicts: edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java Former-commit-id: 869235c02a [formerly 16f5ff0979] [formerly b84dda5930] [formerly 869235c02a [formerly 16f5ff0979] [formerly b84dda5930] [formerly 419c5f4aba [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]] Former-commit-id: 419c5f4aba Former-commit-id: bab435f286 [formerly af06c5a890] [formerly dd639a780b77ef5a2f827ee961c20e9db23d2d31 [formerly 66d30e59a3]] Former-commit-id: 27bd7f3ff5ce8e46cd91569a3f0cf62fa9127e53 [formerly 935542914d] Former-commit-id: 196f53e609		2014-06-20 14:01:55 -04:00
cave	CM-MERGE:14.1.3-2,-3 into 14.2.2	2014-06-20 14:01:55 -04:00
cots	Issue #2581 fix local storm report delta script and unique constraint	2014-01-15 09:50:35 -06:00
cotsSource/org.apache.qpid	13.5.1-7 baseline	2013-07-18 12:07:22 -04:00
deltaScripts	Issue #3142: Improve error-handling and logging in CleanupGfeHDF5Storage delta script.	2014-05-08 16:51:41 -05:00
edexOsgi	CM-MERGE:14.1.3-2,-3 into 14.2.2	2014-06-20 14:01:55 -04:00
javaUtilities	Issue #2788 Fix topo for large areas.	2014-02-13 10:10:34 -06:00
ldm	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
localApps	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
localization	Issue #2186 add generic pdo distributor and move the gfe routes to the gfe file; remove config.xml from warngen localization as it breaks things	2013-07-11 13:32:26 -05:00
MHSEmulator	Issue #2009: Fix NullPointerException in SocketServer start up.	2013-07-23 13:57:38 -05:00
msi	Merge branch 'master_14.1.1' into master_14.2.1	2014-03-07 09:01:09 -05:00
nativeLib	Issue #3102: Fix edexBridge connection leak	2014-05-06 10:32:31 -05:00
ncep	Issue #2919 fix windows error due to gempak library missing	2014-03-20 09:38:07 -05:00
ost	Issue #3017 Update SatSpatialFactory to have more specific methods.	2014-04-15 13:29:05 -05:00
pythonPackages	Merge branch 'master_14.1.2' into master_14.2.1	2014-04-09 16:00:54 -05:00
RadarServer	Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2	2014-05-16 16:40:38 -05:00
rpms	Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2	2014-05-20 14:35:34 -04:00
testProcedures/testDocuments	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
tests	CM-MERGE:14.1.3-2,-3 into 14.2.2	2014-06-20 14:01:55 -04:00
tools	12.9.1-5 baseline	2012-08-21 15:27:03 -05:00
.gitignore	Fix the git ignore file	2012-09-14 12:04:24 -05:00