xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning
History
Shawn.Hooper 105e4a5ceb Merge branch 'master_16.2.1-p1-lx' into master_16.2.2 
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/extremeWindWarningFollowup.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm

Change-Id: I9093801630eb7c345d0ba69e684943798fb0b5d9

Former-commit-id: 8a4b0527806a73c69dc9be22e7aa1025fcb4b617
2016-06-08 10:55:30 -04:00
..
config Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2 2016-04-05 23:14:48 -05:00
dataaccess Omaha #4486 - Hibernate return java.util.Date instead of java.sql.Timestamp 2015-08-05 15:19:05 -05:00
gis Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-01-20 15:23:43 -06:00
portions ASM #15688 - WarnGen: wrong portions of counties at PQR 2016-01-05 12:46:43 -05:00
request Omaha #4320: Add QC check to warngen products to test that product passes through WarningDecoder without error. 2015-03-25 23:14:18 -05:00
response Omaha #4320: Add QC check to warngen products to test that product passes through WarningDecoder without error. 2015-03-25 23:14:18 -05:00
util Merge branch 'master_16.2.1-p1-lx' into master_16.2.2 2016-06-08 10:55:30 -04:00
AbstractWarningRecord.java Omaha #4360 Changes to use annotatin to obtain null values to use in non-nullable fields. 2015-08-25 07:24:29 -05:00
EmergencyType.java 14.1.1-4 baseline 2013-10-28 10:55:16 -04:00
PracticeWarningRecord.java Omaha #4360 DataURI updated for tables derived from AbstractWarningRecord. 2015-07-29 14:58:16 -05:00
WarningConstants.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
WarningRecord.java Omaha #4360 DataURI updated for tables derived from AbstractWarningRecord. 2015-07-29 14:58:16 -05:00