Richard Peter
|
59e9fe78f2
|
Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
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/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java
Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5
Former-commit-id: 23eafaba3d [formerly 2457d0e6f7] [formerly 23eafaba3d [formerly 2457d0e6f7] [formerly 8de1ebcb65 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]]
Former-commit-id: 8de1ebcb65
Former-commit-id: 746bbb0885 [formerly f7d8755ba9]
Former-commit-id: bf3ddbb62b
|
2014-12-12 10:36:04 -06:00 |
|
Mike Duff
|
fab77b664b
|
Issue #3026 - Fix for HPE displays is volume browser
Change-Id: I1ef2766e9bf74e7ad82cc36cd4e4a35659aacf39
Former-commit-id: 3ab236aca3 [formerly 67f3b00beb] [formerly 3ab236aca3 [formerly 67f3b00beb] [formerly c1bea3b41f [formerly a375e64e7ee3276be47b26f4386e7bc6491bc740]]]
Former-commit-id: c1bea3b41f
Former-commit-id: 04222b8e43 [formerly 3f0f42a7df]
Former-commit-id: aff7af3377
|
2014-11-21 13:56:46 -06:00 |
|
Nate Jensen
|
7336692b85
|
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 253198b5bc [formerly b3083a663e] [formerly 253198b5bc [formerly b3083a663e] [formerly 9b72a1399d [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]
Former-commit-id: 9b72a1399d
Former-commit-id: 58a4cb95c1 [formerly d67083655a]
Former-commit-id: 951feab33d
|
2014-08-14 10:22:37 -05:00 |
|
Bryan Kowal
|
1578a42992
|
Issue #3026 - remove unnecessary hpe ffmp dependency
Former-commit-id: 8f16f25cd7 [formerly 6e6a6a73ee] [formerly 8f16f25cd7 [formerly 6e6a6a73ee] [formerly faa6b09ac9 [formerly c94c973ef6a663f93a6b1a6301f5553d4e88ac73]]]
Former-commit-id: faa6b09ac9
Former-commit-id: 9153d61b90 [formerly 5f5987f57b]
Former-commit-id: 31d2290415
|
2014-05-12 11:46:35 -05:00 |
|
Mike Duff
|
4adf657556
|
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: 0456fd0597 [formerly 8498235fd8] [formerly 0456fd0597 [formerly 8498235fd8] [formerly 6a67638a94 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]]
Former-commit-id: 6a67638a94
Former-commit-id: f49192936a [formerly 70c8135fde]
Former-commit-id: 916d90ee64
|
2014-05-08 14:36:54 -05:00 |
|