Mirror of Unidata's AWIPS2.
Find a file
Ana Rivera 854a203107 Merge branch 'master_14.4.1' into emc_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1

Former-commit-id: 48cb3fd143 [formerly 654d08a588] [formerly 98ac97e397] [formerly 48cb3fd143 [formerly 654d08a588] [formerly 98ac97e397] [formerly 7c25945fd9 [formerly 98ac97e397 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]]]]
Former-commit-id: 7c25945fd9
Former-commit-id: cecf9e2ef6 [formerly d6630d8f35] [formerly 0612a8075112c53ca561737244fdc42031bbb44c [formerly eae1bd317d]]
Former-commit-id: bb15a8f43d38e1956b090806df98b75978f14292 [formerly cd2841195b]
Former-commit-id: aa04bff454
2015-01-26 18:45:26 +00:00
build Omaha #3836 - initial commit of the groovy-based developer deployment. 2014-12-04 16:17:53 -06:00
cave Merge branch 'master_14.4.1' into emc_14.4.1 2015-01-26 18:45:26 +00:00
deltaScripts Omaha #3921 Added IF EXISTS clause to table drop 2014-12-16 11:05:17 -06:00
edexOsgi Merge branch 'master_14.4.1' into emc_14.4.1 2015-01-26 18:45:26 +00:00
javaUtilities Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm. 2014-12-05 09:20:23 -06:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP. 2014-05-09 09:34:49 -05: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 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 2015-01-22 16:05:41 -05:00
ncep Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 2015-01-22 16:05:52 -05:00
ost Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 2014-09-23 11:41:10 -05:00
pythonPackages Omaha #3393 Fix negative k values 2014-12-16 11:01:45 -05:00
RadarServer Omaha #3502 removed common.convert from rcm feature 2014-08-11 09:56:53 -05:00
rpms ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m. 2015-01-12 13:03:31 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Merge branch 'ncep_14.2.2-n' into ncep_14.4.1 2014-12-16 13:06:21 -05:00
.gitignore Omaha #3685 Add support for sending specific products in mixed case 2014-10-22 14:29:30 -05:00