awips2/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth
Richard Peter 1c150e6e8b 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: a47eaa9af45db41391fe46e36ec0793f70d06ad6
2014-02-27 15:18:26 -06:00
..
.settings 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
META-INF Merge branch 'omaha_14.2.1' (14.2.1-8) into development 2014-02-27 15:18:26 -06:00
res/spring Issue #2636 - Change how retrieval plan is updated over time. 2014-02-18 12:05:26 -06:00
resources Issue #2106 Improve BandwidthManager performance, proposed changes are checked much quicker 2013-07-10 15:59:36 -05:00
src/com/raytheon/uf/edex/datadelivery/bandwidth Issue #2636 Try Catch around the MaintTask 2014-02-21 16:01:20 -06:00
utility/common_static/base/datadelivery 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
.classpath 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
.project 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
build.properties Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins. 2014-01-06 17:03:45 -06:00
com.raytheon.uf.edex.datadelivery.bandwidth.ecl 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00