Steve Harris
ec8b83dd67
Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2
...
16.2.1-lx-29
Conflicts:
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/SimpleLogViewer.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcFreezeOptionsDialog.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcTempOptionsDialog.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DeletePolygonDlg.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/total/TotalLightningDecoder.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SaveCombinationsFileHandler.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm
Former-commit-id: 17c68986a20e9a589d40407800dd52678fcda68b
2016-05-12 09:28:49 -05:00
Shawn.Hooper
6dd7d6e445
Merge branch 'master_16.2.1' into master_16.2.1-lx
...
Former-commit-id: c2912e8f8c98c1e7a4b97fc431db7f054452425a
2016-05-03 13:51:27 -04:00
Ben Steffensmeier
8322325583
Omaha #5597 Fix GLD 1 min plot.
...
Former-commit-id: 489f3c6a5a9e0e1ff034fc6ae6df81110397f6ab
2016-04-28 12:52:34 -05:00
Shawn.Hooper
7a678147db
Merge branch 'master_16.2.1' into master_16.2.1-lx
...
Conflicts:
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
Change-Id: Id20e97bd2a76af3b3e04f084d9fa2c1fcc344af3
Former-commit-id: 2c2db68086fceaa3e0608f2a8b88d03522690daa
2016-04-27 09:26:33 -04:00
Ben Steffensmeier
3b6a0ddfd3
Omaha #5597 Include update interval in lightning legend.
...
Former-commit-id: cd91988db55ace2d0f993a657d1f17338507b778
2016-04-26 12:02:26 -05:00
Ben Steffensmeier
9e8c36cc91
Omaha #5597 Create additional lightning menu items.
...
Former-commit-id: 834f42daf8bf9d31dbbf01618dbd6c007c49f8a4
2016-04-22 14:57:03 -05:00
Penghai Wang
1ff00e7088
Merge branch 'master_16.2.2' into asdt_16.2.2
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/DataIngestFilterDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
Former-commit-id: 51bcd1df67c24bce021a89b8708e48306dd0691e
2016-04-12 16:45:34 +00:00
Andrew Moore
8d07e30859
VLab Issue #15589 - DR 18336, binlightning legends should update on keep-alive records; fixes #15589
...
Change-Id: I76706147e72fface4155ab4be763dd8b1407991d
Former-commit-id: fc1cfd3b3729926aaa6bd6f12416065f1e625d00
2016-03-08 15:29:41 +00:00
Ron Anderson
9f255c8d50
Omaha #5070 Adjust font sizes for dpi scaling
...
(cherry picked from commit 0fac683b60
2016-01-13 19:17:37 -06:00
Steve Harris
260d20c920
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/OgcLayer.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerCollector.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerTransformer.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/filter/ComparisonFilter.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/gml3_1_1/EnvelopeConverter.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/gml3_2_1/EnvelopeConverter.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/gml3_2_1/GeometryConverter.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/http/IOgcHttpPooler.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/http/OgcHttpHandler.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/http/SingleHttpPool.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/spatial/CoordinateUtil.java
edexOsgi/com.raytheon.uf.edex.wfs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.wfs/src/com/raytheon/uf/edex/wfs/filter/v1_1_0/QueryFilterVisitor.java
edexOsgi/com.raytheon.uf.edex.wfs/src/com/raytheon/uf/edex/wfs/filter/v2_0_0/AbstractQueryFilterVisitor.java
edexOsgi/com.raytheon.uf.edex.wfs/src/com/raytheon/uf/edex/wfs/filter/v2_0_0/QueryExpressionVisitor.java
edexOsgi/com.raytheon.uf.edex.wfs/src/com/raytheon/uf/edex/wfs/reg/WfsRegistryImpl.java
Former-commit-id: b9aab5f7931fde1d2aaf9ba0402bf35314cd0c5f
2015-11-12 13:57:32 -06:00
Ron Anderson
0fac683b60
Omaha #5070 Adjust font sizes for dpi scaling
...
Change-Id: I94b264ee1d96f42423874062b4682934a2521cae
Former-commit-id: 330ae8034e6457f20224c81cf3886d797ea5b8fc
2015-11-09 09:42:07 -06:00
Ben Steffensmeier
763655687f
Omaha #5090 Include end times in lightning availability.
...
Former-commit-id: 043d398f7c2d2f2c4ccd1a3e68c48b15901d95cd
2015-11-05 11:13:18 -06:00
Ben Steffensmeier
2ff21bbded
Omaha #4605 Request records for new lightning frames to ensure cache consistency.
...
Former-commit-id: 872adfc0433e129364c441b34d13be7044686e6a
2015-10-20 14:36:18 -05:00
Ben Steffensmeier
e7fa607226
Omaha #4605 Lightning time matching adjustments.
...
Former-commit-id: 6d4763fec2896bbb59c3be8abe1d855356a0a4cd
2015-09-28 10:23:48 -05:00
Nate Jensen
6b764ff822
Omaha #4856 fix NPE in D2DTimeMatcher
...
Change-Id: Ibf0a8028f8c2e3545f76dc731fcf70f0f6d04399
Former-commit-id: 0d7a4d8c1f22e4f4bcc7d64336e2063f627d9703
2015-09-10 10:06:37 -05:00
Steve Harris
55b82a66ff
Merge branch 'omaha_sails_15.1.1' into omaha_16.1.1
...
Conflicts:
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/GridLightningResource.java
Former-commit-id: b66814c4efc93113c131298b904f02675cda88ea
2015-07-13 18:39:29 -05:00
Brian Clements
fc6ed8c5d1
Omaha #4606 added better style rules for grid lightning
...
Change-Id: I5c438699bd61a1cb3fa3fed5dabde8edc1ca7d5c
Former-commit-id: 85bbc70d7f3c80f221e374c4fab74e00a560d9b7
2015-07-02 14:22:34 -05:00
Nate Jensen
f6ca835ee9
Merge "Omaha #4597 better labels for lightning resources" into omaha_15.1.1
...
Former-commit-id: 012b25ea74cafa905d88dc6b6ac266a3cb5e6547
2015-07-01 14:51:48 -05:00
Nate Jensen
a6fb4146a0
Merge "Omaha #4595 fixed total lightning resource ordering" into omaha_15.1.1
...
Former-commit-id: 4d3138ac1f4df02cb372722a7b6b57c41dd7bcc9
2015-07-01 14:26:29 -05:00
Brian Clements
631cc5cabe
Omaha #4597 better labels for lightning resources
...
Change-Id: I5e7792e881c95cbb1ecea30320e9f0892457013c
Former-commit-id: d2b5d5e1d4bd2e67e34c212ff09595e36abbaeab
2015-07-01 14:18:03 -05:00
Brian Clements
588b2d83f4
Omaha #4596 changed total lightning menu names to ENI Total Lightning
...
Change-Id: Ia8c1f740d28d2cf063eb14132b3c403e6fa174de
Former-commit-id: 59c5fc0d7e49dfc4fe27435ef0664d90d78c4826
2015-07-01 13:11:29 -05:00
Brian Clements
107d672250
Omaha #4595 fixed total lightning resource ordering
...
Change-Id: I27928e04c9f809c1519d972e7161e852b74f86d6
Former-commit-id: 9fe972d808d520e42772f8dc9207a930f8f98111
2015-07-01 12:48:20 -05:00
Nate Jensen
727f533e7d
Merge "Omaha #4594 added 1-min plot menu items for total lightning" into omaha_15.1.1
...
Former-commit-id: 60e77e4a4196b1a438b9dd0f81d05c40e080b484
2015-07-01 11:00:47 -05:00
Brian Clements
489ee6c0c3
Omaha #4594 added 1-min plot menu items for total lightning
...
Change-Id: I85dc8d484183c378cac1bc54a33160cf7b9104dc
Former-commit-id: 392356843cccb2c88ae616e1c2e5035e42c72845
2015-07-01 10:38:45 -05:00
Brian Clements
04a0284fad
Omaha #4592 lightning cloud flashes are now rendered as points
...
Change-Id: I26bef7436106b76eebf8b3480de383ac8f029641
Former-commit-id: ca1497751c0f809dd02a10c77d3d382b6ea1136c
2015-07-01 09:50:17 -05:00
David Lovely
80dc4c85d9
Omaha #4146 Bundled class files in a jar when unpacked.
...
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02
Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
2015-05-19 10:23:35 -05:00
Ben Steffensmeier
72d601a2a7
Omaha #4079 Extract core grid and point rendering capabilities.
...
Former-commit-id: a0caefe923b18859fd89cb36749b31e3b24eecbe
2015-05-15 13:55:10 -05:00
Ben Steffensmeier
6c2d341080
Omaha #4284 Create better id for obs/lightning menu.
...
Former-commit-id: 31893413de438660784ee82274e23f361abb0c1c
2015-05-07 10:53:46 -05:00
Brian Clements
cbe0a699fb
Omaha #4386 lightning resource updates frames asynchronously
...
Change-Id: If0b43cb4d53e16d7cec4b4193da8437338957379
Former-commit-id: 9c82bcc5c93dcd30e3c645f673611ac6710c8fab
2015-04-09 10:25:28 -05:00
Fay.Liang
1c80edbed0
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: ec7875e9a4bec3752aeb8442fca15e4e4fd02571
2015-03-18 15:08:01 -04:00
Jason Burks
3d3f3a6535
VLab Issue #6926 - Moved LMA Menus to be in the lightning Menu; fixes #6926
...
Updated the based on feddback from Ben.
Change-Id: I2c400f98dc80ee2583818da26466fa9eac37f281
Former-commit-id: 56d2ffeaf8564c8ea02f52ef35e8aebea2e9f992
2015-03-14 14:36:37 +00:00
Ben Steffensmeier
989acdf74b
Omaha #4233 Remove cloud flash and pulse menu items from GLD and NLDN menus.
...
Change-Id: I73f67925b0f14fd1eb062ea8f157dc7487f0b030
Former-commit-id: 0e31a9da60cfa9d99a8aae21f3bf2f403b838312
2015-03-05 16:20:44 -06:00
Brian Clements
c56645dd01
Omaha #3608 improved error handling in lightning frame retriever
...
Change-Id: I02784a7f2d23bf37d56294e55cb9ec759d1f9080
Former-commit-id: 0551b91b995c893fddee52cabdfbdccf83121a31
2014-09-11 11:52:23 -05:00
Steve Harris
5d58625abc
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: 8793dca41f756ba812206b48391caea6e593a657
2014-08-29 10:17:52 -05:00
Brian.Dyke
aa83bf804f
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: 7334d3991903dfe8a62728de33c21e81534fdbb6
2014-08-27 11:19:19 -04:00
Steve Harris
038b284066
Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java
Former-commit-id: 03ba5101d6f277b55173f72c2a63869e9dc31c3f
2014-08-26 16:25:21 -05:00
Brian Clements
fc2e7f52b9
Issue #3542 fixed lightning count clipping issue
...
Change-Id: I40aa62558542d3da9b3abd8f82de9e5d8244870b
Former-commit-id: 937c656ba2a9fc98bfa5655a5020d470f83b898f
2014-08-19 09:00:58 -05:00
Brian Clements
30ca12aae7
Issue #3488 added sanity check for bin range in lightning viz resource
...
Change-Id: I23ec1614821dcbc18c06f58e3ef00371988fc30a
Former-commit-id: 701b56ec37053654e64cfd6ea831aad4ea7b9d8a
2014-08-04 11:22:12 -05:00
Brian Clements
c1f5fe0d3a
Omaha #3463 grid lightning uses sparse data source
...
Change-Id: I243b3a662bf1f3ab320ef5fee7637fd5245e8ad3
Former-commit-id: 00b60fd6ed95f3df30b1f477619ace9145d17f45
2014-07-29 14:30:57 -05:00
Brian Clements
334f5f107e
Omaha #3451 extended colorbar range for grid lightning
...
Change-Id: Ia734b28b6d1b0daf8c257d2cc72c2aca1bd2de46
Former-commit-id: 7d3789e0832e7be5b0a87176cbf26509b6f3c708
2014-07-29 10:30:10 -05:00
Brian Clements
ac0db6291b
Omaha #3450 fixed grid lightning menu ids so more than one can be torn off at a time
...
Change-Id: I413bb4ff91aa3ad0c56d386c8466400afbf58204
Former-commit-id: 662bd201dba808edcce74aeafa1257a157e6b6ea
2014-07-28 12:51:07 -05:00
Brian Clements
e5a63e5cf5
Omaha #3333 grid lightning image by default, log style rule
...
Change-Id: Iaec485a35cce1deba7943ae4550c004badbf0a32
Former-commit-id: 127cdbea94ed37f0a2c3ddf113df8f093549d077
2014-07-24 13:34:43 -05:00
Nate Jensen
3128374080
Merge "Omaha #3214 fixed typos in LightningFrameRetriever" into omaha_14.4.1
...
Former-commit-id: 5a2968189edd1abe58560404fc01dcea82957b5f
2014-07-22 14:01:08 -05:00
Brian Clements
62dcdda0bc
Omaha #3333 grid lightning ignores strikes outside of map
...
Change-Id: I188aac28b50b7ac8a107d785b52471c1d7fe6d14
Former-commit-id: bb55bde76765d330f782524965fe79d5373b6e9f
2014-07-22 13:42:18 -05:00
Brian Clements
3f82ead0b5
Omaha #3214 fixed typos in LightningFrameRetriever
...
Change-Id: I1616b5f64c3d6c99f034c7f7c526a453e0f5578c
Former-commit-id: 7f5868947a0c7bee586908f832f3bb9030c3e84e
2014-07-22 13:33:26 -05:00
Brian Clements
29fc7e7ec4
Omaha #3333 added grid lightning to cave
...
Change-Id: I4e5d21c39168bac285125a39fd148fe69906f221
Former-commit-id: 33736a713a2c360e70f5a06972a7a21937f2b34c
2014-07-11 12:18:05 -05:00
Brian Clements
e4795f6a13
Omaha #3333 removed redundant field from viz lightning
...
Change-Id: I3821f7991757f97b976bac8cde502da977ea0978
Former-commit-id: 2e701ade395cb2ec81d86af714fad825e146dc25
2014-07-07 15:13:28 -05:00
Richard Peter
8ecc27f714
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9
2014-07-01 15:34:39 -05:00
Steve Harris
7acd9ab2dd
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
Steve Harris
419c5f4aba
CM-MERGE:14.1.3-2,-3 into 14.2.2
...
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: ce5767f2bbf5c9627bd43e766c6193c261c48af3
2014-06-20 14:01:55 -04:00
