Mirror of Unidata's AWIPS2.
Find a file
Brian.Dyke bb71483e38 Merge remote-tracking branch 'remotes/origin/master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-5 into 14.2.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py

Former-commit-id: f9a40a24e3 [formerly 2de7de6378] [formerly b066572041] [formerly f9a40a24e3 [formerly 2de7de6378] [formerly b066572041] [formerly c8f21e92fe [formerly b066572041 [formerly d75db45cdfa20fed7568b825ca0dfd8c8689d22a]]]]
Former-commit-id: c8f21e92fe
Former-commit-id: fc476a1286 [formerly 7cc4e0258d] [formerly 24586b50613dc8d4739299b6e8346907dcc7c9c1 [formerly 984f56d23c]]
Former-commit-id: fe64de1e302eac38e0e4ddadb14f850e2fc849b8 [formerly 17d7291548]
Former-commit-id: 43210259de
2014-05-15 16:40:47 -04:00
cave Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1 2014-05-13 11:23: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 Merge remote-tracking branch 'remotes/origin/master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-5 into 14.2.1 2014-05-15 16:40:47 -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 ASM #74 - Fix RadarServer configuration import utility JAR dependency 2014-03-06 17:07:23 +00:00
rpms Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1 2014-05-13 11:23:55 -04:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23) 2014-05-12 16:13:19 -05: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