Mirror of Unidata's AWIPS2.
Find a file
Steve Harris ca55a9b515 Merge branch 'master_14.1.3' into master_14.2.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: bf48d5d368 [formerly 070e025fb4] [formerly 4882158177] [formerly 4882158177 [formerly 483a69c58d]] [formerly bf48d5d368 [formerly 070e025fb4] [formerly 4882158177] [formerly 4882158177 [formerly 483a69c58d]] [formerly fcecd75dfd [formerly 4882158177 [formerly 483a69c58d] [formerly fcecd75dfd [formerly f947df2bf87c0df3e461be5c6dd72e13a0743f61]]]]]
Former-commit-id: fcecd75dfd
Former-commit-id: 3015f7bdd3 [formerly 8d6e807936] [formerly c59b92895c] [formerly 2781bf1550410ffb61513da53f8c88a8b3ce8342 [formerly 0931821f4ace5f034c8b87a9d38c16b0b9763945] [formerly c59b92895c [formerly 29c2cc0c29]]]
Former-commit-id: 4c8e72aa35adbb189361ae2cb0edad08c6c77f7e [formerly 03a3c04cf900c39d9298620704be5b5397111cbe] [formerly 984b7b1df4 [formerly 998c9a4084]]
Former-commit-id: 984b7b1df4
Former-commit-id: 908e6e908b
2014-07-01 18:05:43 -05:00
cave Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2 2014-06-24 10:57:56 -05: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 branch 'master_14.1.3' into master_14.2.2 2014-07-01 18:05:43 -05: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