Mirror of Unidata's AWIPS2.
Find a file
Steve Harris e37e40ed19 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIFieldConverter.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml

Former-commit-id: 396a7cbfefed07cd25e4f8b1f028c566a06e4065
2014-05-07 16:01:53 -05:00
cave Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-05-07 16:01:53 -05:00
cots Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-04-30 11:22:22 -05:00
deltaScripts Merge "Issue #2854: Reorganize deltaScripts" into omaha_14.3.1 2014-05-01 12:06:13 -05:00
edexOsgi Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-05-07 16:01:53 -05:00
javaUtilities Issue #2648 Update hprof info to match grid changes in 14.3 2014-04-23 15:42:33 -05: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 #2758 Fix MHSEmulator to pass small files 2014-02-13 15:53:15 -06:00
msi Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds 2014-03-31 12:37:37 -05:00
nativeLib Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development 2014-03-26 16:19:26 -05:00
ncep Issue #2947 Redo satellite derived parameters to use an inventory to determine availability. 2014-04-16 14:54:59 -05:00
ost Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 2014-04-28 16:27:40 -05:00
pythonPackages Merge branch 'master_14.2.2' into master_14.3.1 2014-04-25 11:06:11 -04:00
RadarServer Merge branch 'omaha_14.2.2' (14.2.2-3) into development 2014-04-11 16:23:09 -05:00
rpms Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1 2014-04-30 19:34:43 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #2992 Updated DD list of active registries 2014-04-30 17:38:28 -05:00
tools Issue #2726: Edex graceful shutdown. 2014-04-14 13:10:11 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00