xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe
History
Richard Peter 73f12bf669 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 2e1688da3b0fce728ce5f4d9180206023aa31cf3 [formerly 62fa535744]
Former-commit-id: 5c0cf804f1
2013-12-17 21:04:53 -06:00
..
config Issue #2361 once again try to remove more common ISerializableObject 2013-10-23 11:40:13 -05:00
dataaccess Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey() 2013-10-31 14:04:55 -05:00
db Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1 2013-12-17 21:04:53 -06:00
discrete Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
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 13.3.1-12 baseline 2013-03-25 13:27:13 -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 Issue #2331 Fixed Topo retrieval for smartTools/procedures 2013-12-04 17:10:48 -06: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 #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
slice Issue #2508 Added DiscreteGridSlice.setKeys() to fix error in serialization. 2013-11-04 15:22:32 -06:00
textproduct Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
time 12.9.1-4 baseline 2012-08-15 15:19:10 -05:00
util Issue #2044 Refactor of GFE Server code 2013-07-25 13:05:56 -05:00
weather Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
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 Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
GridDataHistory.java 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
RemapGrid.java 14.1.1-4 baseline 2013-10-28 10:55:16 -04:00
StatusConstants.java Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00