awips2/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe
Steve Harris d4dc1723c1 Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5

Former-commit-id: d25ab509cb53d559edbd520dd1e3c036166f2e29
2014-07-01 11:08:46 -04:00
..
config Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update 2014-05-20 11:10:26 -05:00
dataaccess Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter. 2014-03-07 18:15:32 -06:00
db Merge branch 'master_14.3.1' (14.3.1-7) into omaha_14.3.1 2014-05-28 07:41:42 -05:00
discrete
exception 13.4.1-7 baseline 2013-05-13 12:58:10 -04:00
grid Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code 2013-10-29 14:33:53 -05:00
point Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour. 2014-04-23 17:04:16 -05:00
python Issue #2033: Move GFE-specific localization files and other misc. code out of 2013-09-16 12:50:04 -05:00
reference Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject 2013-10-03 15:18:55 -05:00
request Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1 2014-07-01 11:08:46 -04:00
sample Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject 2013-10-03 15:18:55 -05:00
serialize 13.4.1-7 baseline 2013-05-13 12:58:10 -04:00
server Issue #2737 Make iscMosaic remove data from ISC when grids are deleted. 2014-04-03 16:56:36 -05:00
slice Issue #2508 Restore DiscreteGridSlice.setKey method used by iscMosaic. 2014-01-10 13:17:44 -06:00
textproduct Merged 1354 -5 and -6 into 1412 based on 1411-25 2014-04-04 12:57:32 -04:00
time
util Issue #2829 - fix the spelling of 'coordinate' in GfeUtil 2014-03-03 17:45:09 -06:00
weather
weatherelement Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager 2013-10-01 11:25:45 -05:00
DiscreteTerm.java
GridDataHistory.java 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
RemapGrid.java Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter. 2014-03-07 18:15:32 -06:00
StatusConstants.java