Mirror of Unidata's AWIPS2.
Find a file
Richard Peter 1d6e9816e0 Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]
Former-commit-id: 50a1b270c5
2014-02-27 15:18:26 -06:00
cave Merge branch 'omaha_14.2.1' (14.2.1-8) into development 2014-02-27 15:18:26 -06:00
cots Issue #2698 added handles to venues 2014-01-31 09:44:31 -06:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Merge branch 'omaha_14.2.1' into development 2014-02-03 10:29:16 -06:00
edexOsgi Merge branch 'omaha_14.2.1' (14.2.1-8) into development 2014-02-27 15:18:26 -06:00
javaUtilities Merge branch 'omaha_14.2.1' (14.2.1-8) into development 2014-02-27 15:18:26 -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 14.1.1-4 baseline 2013-10-28 10:55:16 -04:00
MHSEmulator Issue #2758 Fix MHSEmulator to pass small files 2014-02-13 15:53:15 -06:00
msi Merge branch 'omaha_14.1.1' (14.1.1-11) into development 2013-12-05 12:12:27 -06:00
nativeLib Issue #2783: Rewrite run_report_alarm script into EDEX service. 2014-02-18 13:24:37 -06:00
ncep Merge branch 'omaha_14.2.1' (14.2.1-8) into development 2014-02-27 15:18:26 -06:00
ost 14.1.1-7 baseline 2013-11-06 14:16:14 -05:00
pythonPackages Merge branch 'omaha_14.2.1' (14.2.1-8) into development 2014-02-27 15:18:26 -06:00
RadarServer Issue #2754 - Remove commons logging calls 2014-02-03 12:17:30 -06:00
rpms Merge branch 'omaha_14.2.1' (14.2.1-8) into development 2014-02-27 15:18:26 -06:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #2386 fixed spatial overlap rule application. 2014-02-25 09:22:08 -06: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