Mirror of Unidata's AWIPS2.
Find a file
Fay.Liang 6b77894bd0 ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: eed6737801 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]
Former-commit-id: c6bd5d7675
2015-01-12 13:03:31 -05:00
build Omaha #3836 - initial commit of the groovy-based developer deployment. 2014-12-04 16:17:53 -06:00
cave ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m. 2015-01-12 13:03:31 -05:00
deltaScripts Omaha #3921 Added IF EXISTS clause to table drop 2014-12-16 11:05:17 -06:00
edexOsgi ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m. 2015-01-12 13:03:31 -05: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 ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m. 2015-01-12 13:03:31 -05:00
ncep Merge tag 'OB_14.3.2-8m' into omaha_14.4.1 2014-12-12 10:36:04 -06: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 Omaha #3365 Realign AWIPS2_baseline tests 2014-09-30 12:53:20 -05:00
.gitignore Omaha #3685 Add support for sending specific products in mixed case 2014-10-22 14:29:30 -05:00