xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/javaUtilities
History
Richard Peter 79d3aa4e1a 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: 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]
Former-commit-id: 0e25ae35c1
Former-commit-id: 7bd6a07913
2014-02-27 15:18:26 -06:00
..
build.openfire.plugin Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
build.wes2bridge.utility 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
collaboration.dataserver Issue #2756 new collaboration openfire plugin and http service 2014-02-18 10:03:12 -06:00
com.raytheon.openfire.plugin.configuration.collaboration Issue #2756 new collaboration openfire plugin and http service 2014-02-18 10:03:12 -06:00
com.raytheon.openfire.plugin.detailedfeedlog Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.uf.anttasks.includesgen 13.4.1-1 baseline 2013-04-24 17:15:55 -05:00
com.raytheon.uf.featureexplorer 13.5.1-4 baseline 2013-06-28 09:46:25 -04:00
com.raytheon.uf.logsrv Issue #2359 remove ignore threads capability since it was a hack to stop 2014-01-23 18:09:50 -06:00
com.raytheon.uf.topo.utilities Issue #2788 Fix topo for large areas. 2014-02-13 10:10:34 -06:00
com.raytheon.uf.viz.hprof Issue #2648 Add AlertMessage output. 2014-02-12 17:08:23 -06:00
com.raytheon.wes2bridge.common 13.4.1-4 baseline 2013-05-02 10:00:38 -05:00
com.raytheon.wes2bridge.configuration Issue #2754 - Remove logging calls 2014-02-03 09:29:47 -06:00
com.raytheon.wes2bridge.datalink Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.wes2bridge.manager Issue #2754 - Remove logging calls 2014-02-03 09:29:47 -06:00
com.raytheon.wes2bridge.utility.feature 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
com.raytheon.wes2bridge.utility.product Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
hydro Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf 2013-12-16 16:39:10 -06:00
yajsw Merge branch 'omaha_14.1.1' into development_on_RHEL6 2013-10-31 15:34:46 -05:00