Mirror of Unidata's AWIPS2.
Find a file
Fay.Liang 9d752cfc41 Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/proc_receive_config

Former-commit-id: 7349df3d27 [formerly 9742125df2b54fe54e1e06dba554de21db52f5a0]
Former-commit-id: b0d72bf798
2015-04-08 12:22:27 -04:00
build Omaha #4337 - merge modification of logback.xml 2015-03-26 15:56:04 -05:00
cave Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1 2015-04-08 12:22:27 -04:00
crh ASM #17168 - Add directory/files needed to create new decoderpostprocessor rpm 2015-02-26 13:15:17 -05:00
deltaScripts Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1 2015-04-08 12:22:27 -04:00
edexOsgi Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1 2015-04-08 12:22:27 -04:00
javaUtilities Omaha #3299 - Updated deploy-install to find features 2015-02-25 09:51:49 -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
nativeLib Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1 2015-04-08 12:22:27 -04:00
ost Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 2014-09-23 11:41:10 -05:00
pythonPackages Merge tag 'OB_14.4.1-20m' into omaha_15.1.1 2015-03-26 09:57:17 -05:00
RadarServer Merge tag 'OB_15.1.1-2m' into omaha_15.1.1 2015-03-30 11:07:52 -05:00
rpms Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1 2015-04-08 12:22:27 -04: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