Nate Jensen
|
805ff08819
|
Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe
plugin
Change-Id: I8fcd61af003366405b4b40661bb7e471bf03c64a
Former-commit-id: 33fb2c2e0d [formerly 40d1fda798] [formerly f086bb0c9b] [formerly 33fb2c2e0d [formerly 40d1fda798] [formerly f086bb0c9b] [formerly ceec3d48f0 [formerly f086bb0c9b [formerly e2feed87185e15d9e681ca0155b03d1d9ff29e25]]]]
Former-commit-id: ceec3d48f0
Former-commit-id: 134f34c4df [formerly dfe50ee038] [formerly d97211d5385681fec6abca63498e85889f803dd8 [formerly 715932091e]]
Former-commit-id: 3e07e40b8dcad3da2eb07fe1e1fd1960476568c1 [formerly 1e5433c9c3]
Former-commit-id: c8c25d9224
|
2014-04-14 14:28:11 -05:00 |
|
Richard Peter
|
626ab0bd58
|
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 56089894f2 [formerly d65b11d404] [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]]
Former-commit-id: ea5917ddde80aa4f2fa095272512ef873794f21c [formerly b6482f2e54]
Former-commit-id: a22345ea6b
|
2014-04-11 16:23:09 -05:00 |
|
David Gillingham
|
cb52793865
|
Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d
Former-commit-id: 41393ac5a1 [formerly 1c7e650e6a] [formerly c8a6dc8769] [formerly 41393ac5a1 [formerly 1c7e650e6a] [formerly c8a6dc8769] [formerly da31ab2042 [formerly c8a6dc8769 [formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]]]]
Former-commit-id: da31ab2042
Former-commit-id: 969dccd366 [formerly 0385a4395e] [formerly cb9962190ec6d166cbb1fc49f2bf0444ee77d9c4 [formerly 72229cfb94]]
Former-commit-id: fc3f96a9df8963b4b0cfcf9e1a139bf208111b7b [formerly 89046665f6]
Former-commit-id: 2ab21ac335
|
2014-04-10 11:24:40 -05:00 |
|
Ron Anderson
|
3936bcaf65
|
Merge "Issue #2737 Make iscMosaic remove data from ISC when grids are deleted." into development
Former-commit-id: d4d7e81799 [formerly 83d660cf2e] [formerly 2042d975c2] [formerly d4d7e81799 [formerly 83d660cf2e] [formerly 2042d975c2] [formerly debde74356 [formerly 2042d975c2 [formerly 93c224f21b0aec4eef0eaf0f57c5f48237c68265]]]]
Former-commit-id: debde74356
Former-commit-id: bb12a4b904 [formerly c3a4664534] [formerly 108d722236ee29849900176e85dc9365b6df27dd [formerly d4fabcc4b1]]
Former-commit-id: d95b981e70d3c0b2174f3e3b70a68d535bf2b492 [formerly 8f487dd5dc]
Former-commit-id: e1fc1365af
|
2014-04-04 08:35:12 -05:00 |
|
Ron Anderson
|
725dfcaa99
|
Issue #2737 Make iscMosaic remove data from ISC when grids are deleted.
Change-Id: Ibf1255244b6e5856b5052e541727d427b331d9fe
Former-commit-id: 700d2ba37f [formerly 51bb7f474d] [formerly 01ab6ce52d] [formerly 700d2ba37f [formerly 51bb7f474d] [formerly 01ab6ce52d] [formerly ea250a253f [formerly 01ab6ce52d [formerly 5db8738783d79e8a48bfffac49910cc46df61ad2]]]]
Former-commit-id: ea250a253f
Former-commit-id: 1c032ab6f0 [formerly 4d9d2f59aa] [formerly 11feb3f28beaaea54d7cf1c0af9fce201f9ec319 [formerly de50c5e47d]]
Former-commit-id: 5dcab0023593976bafa739a23acb671a15943281 [formerly 9e568e1749]
Former-commit-id: 1e9e4479c8
|
2014-04-03 16:56:36 -05:00 |
|
Ron Anderson
|
de22018c08
|
Merge "Issue #2961 Fixed issue where ISC grids are selected based on the start time of the Fcst and not the grid that overlaps the spatial editor time." into development
Former-commit-id: 946a3857f9 [formerly 39bcb64c7f] [formerly 90429229f7] [formerly 946a3857f9 [formerly 39bcb64c7f] [formerly 90429229f7] [formerly 52c2092e1c [formerly 90429229f7 [formerly 4e57b93f72b9e73a4ac2e1205393b3cae8e21958]]]]
Former-commit-id: 52c2092e1c
Former-commit-id: 11df67c9f4 [formerly 3e144c80a6] [formerly 6fa5ea130dedea2082686ac70b1f9913fc8f6110 [formerly 2bee12cb02]]
Former-commit-id: 5866f3a4adb0d8c3941128fe1565561cff073d1d [formerly 0b3850d11a]
Former-commit-id: e3b7e2a24a
|
2014-04-03 14:27:41 -05:00 |
|
Ron Anderson
|
29024b161e
|
Issue #2961 Fixed issue where ISC grids are selected based on the start time of the
Fcst and not the grid that overlaps the spatial editor time.
Change-Id: Ifb89fc1305db8a654067185064c3d570dfecd3b2
Former-commit-id: 660bc974e9 [formerly a9be0658e4] [formerly eb90c1f216] [formerly 660bc974e9 [formerly a9be0658e4] [formerly eb90c1f216] [formerly db080f3eba [formerly eb90c1f216 [formerly 131f9c0933280d25f61458e270b5bb9715c2d67b]]]]
Former-commit-id: db080f3eba
Former-commit-id: 5d84747472 [formerly c880002b1e] [formerly f40c2938a553a6bd3809588d95bac2b3641d2765 [formerly c7b392e36b]]
Former-commit-id: 02d585704570326f08c96d5fae3b65c595dad235 [formerly 1e546a1fed]
Former-commit-id: fdb60c48d0
|
2014-04-03 13:04:55 -05:00 |
|
Ron Anderson
|
27d225d4a5
|
Merge "Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py" into development
Former-commit-id: dd532a6edb [formerly bbecf3d2da] [formerly b67c36c08b] [formerly dd532a6edb [formerly bbecf3d2da] [formerly b67c36c08b] [formerly 822acbb32b [formerly b67c36c08b [formerly dc953f5285a2fb5c56148b78c5db31c4ccdda3a7]]]]
Former-commit-id: 822acbb32b
Former-commit-id: 2a0c06c814 [formerly b5680ce7f3] [formerly 2376fd5832ad8d1cfd61ec7ab3b9ba1df3cefd08 [formerly f7910616ca]]
Former-commit-id: 637dd659dc9349e6f757c7d9cc06d52e050fd572 [formerly 4309f32433]
Former-commit-id: 792a88f134
|
2014-04-03 12:57:16 -05:00 |
|
Ron Anderson
|
a30e21e0f8
|
Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py
Change-Id: I75d37583d15decaeb50db0d70fc0ba1f3a8a7b7c
Former-commit-id: 426d0fcdd7 [formerly bd7e411653] [formerly 11c8529862] [formerly 426d0fcdd7 [formerly bd7e411653] [formerly 11c8529862] [formerly 2abfe6de77 [formerly 11c8529862 [formerly 552c3e9485ee03c552851c98455e57f12a8f033f]]]]
Former-commit-id: 2abfe6de77
Former-commit-id: f35fcf7c6f [formerly 8dcbe3a815] [formerly 2d2d6d92129690dc9335d9253ddd5235606cc9bd [formerly bd502fbe07]]
Former-commit-id: 892da9aec2fdbe7f3038c519708c65404c165f7a [formerly acb35f67ce]
Former-commit-id: 1afd3fb1a4
|
2014-04-03 12:42:42 -05:00 |
|
Ron Anderson
|
93acb60fdf
|
Merge "Issue #2847: Add option to export only selected parms to GFE KML export dialog." into development
Former-commit-id: 6d94c0be65 [formerly 6fa61adbd4] [formerly b61a1b346d] [formerly 6d94c0be65 [formerly 6fa61adbd4] [formerly b61a1b346d] [formerly 60f3ad27e2 [formerly b61a1b346d [formerly 17ab17280bc6e4c990edec44a40f78f1f36f5ced]]]]
Former-commit-id: 60f3ad27e2
Former-commit-id: 048d7d363b [formerly 6f9cadafa7] [formerly 62d6e4880917155c00a538024e1217517051a84e [formerly d1e5fdd365]]
Former-commit-id: a22fb5a3a000eeff2e73a0ad000631b0f57569ff [formerly 5fb2f8e94d]
Former-commit-id: 746bc34cc6
|
2014-04-03 11:47:15 -05:00 |
|
David Gillingham
|
684be4ea5f
|
Issue #2847: Add option to export only selected parms to GFE KML export dialog.
Change-Id: I6f0111d0f8eaed302c18dcd08e4433a7e544e669
Former-commit-id: f32b34b736 [formerly 7e165846d2] [formerly 965d76c139] [formerly f32b34b736 [formerly 7e165846d2] [formerly 965d76c139] [formerly 7f36b8ba9c [formerly 965d76c139 [formerly cdb6f07f0a514c159e792e3bb911ef93a8354b2d]]]]
Former-commit-id: 7f36b8ba9c
Former-commit-id: 87ce104d67 [formerly 9fcb3f6920] [formerly aa5f9f82bfce0e52bd621bb6427bfb10d3b1447a [formerly 017ea69812]]
Former-commit-id: e57b8ddc5b7e10e10f98897ec5b3cb133da1a9a4 [formerly 797f124905]
Former-commit-id: 0e67fffa35
|
2014-04-03 11:30:59 -05:00 |
|
Ron Anderson
|
360d0ba509
|
Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py
Change-Id: Ic01c265f792d855751aeac9890953600d531c12c
Former-commit-id: ee8d561f81 [formerly 7e58a73dbf] [formerly 8da64048e7] [formerly ee8d561f81 [formerly 7e58a73dbf] [formerly 8da64048e7] [formerly 69cd6a1598 [formerly 8da64048e7 [formerly cfec08f8c4ac8552699e9387148ba2e9d0dc9558]]]]
Former-commit-id: 69cd6a1598
Former-commit-id: ec74556c48 [formerly b16405ecb3] [formerly ef0141d58da5e73da45520afce6c1175f7c71496 [formerly dde9253f15]]
Former-commit-id: 72d121851571db14da4879bf84985df48d304e87 [formerly b8e1eca066]
Former-commit-id: 5309dbf14c
|
2014-04-02 18:22:51 -05:00 |
|
Ron Anderson
|
38a1d957aa
|
Issue #2961 Code clean up. Issue was fixed under #2703
Added listener to redo time matching when ISC mode changes
Change-Id: Ic2a883c6255a81cac1316d268225fb6078921cb1
Former-commit-id: 82062553f0 [formerly 51ffcd7ce8] [formerly f4b31b336a] [formerly 82062553f0 [formerly 51ffcd7ce8] [formerly f4b31b336a] [formerly efb27793f4 [formerly f4b31b336a [formerly afbab6d1d0b4f1aad80e5a082f536f608f523380]]]]
Former-commit-id: efb27793f4
Former-commit-id: 8463514df0 [formerly c1e5e2fd18] [formerly 3dc1bbaea04ff0ad7927eabe00966a8cca040dc6 [formerly bfed3dc521]]
Former-commit-id: 35f76f0c3fa6a795124c70b69a2554a6171126b2 [formerly 6385c81420]
Former-commit-id: dfcdaadbe2
|
2014-04-02 16:55:02 -05:00 |
|
David Friedman
|
8ea6e0b064
|
Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1e4ac84f99 [formerly 1168a3eae5] [formerly 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]]
Former-commit-id: beb961d5304e2c2df6afc0538bae8011c8b6f63f [formerly dde12b4fc3]
Former-commit-id: 8f8f55dd3c
|
2014-03-27 19:17:03 +00:00 |
|
Rici.Yu
|
cd49835497
|
ASM #84 - fix default time range for smart tools
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99
Former-commit-id: 777bd46d68 [formerly c559ade333] [formerly 74b1c827ee] [formerly 777bd46d68 [formerly c559ade333] [formerly 74b1c827ee] [formerly 58f9857344 [formerly 74b1c827ee [formerly cfb3459d6314afa396c89b90bf42ab539fd15d8c]]]]
Former-commit-id: 58f9857344
Former-commit-id: a3e865e011 [formerly e877c81c88] [formerly 8ff482b2584775bc71dc4df96949f7260608e124 [formerly 0ee8baf0c3]]
Former-commit-id: 679e5fa6043cfd72296cbdd819ff457a1c6da449 [formerly 1684740d02]
Former-commit-id: f32491f913
|
2014-03-14 14:39:56 -04:00 |
|
Ben Steffensmeier
|
fd2fbe839d
|
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
Former-commit-id: 094086b5c2 [formerly c0b478eb97] [formerly 9122b6da99] [formerly 094086b5c2 [formerly c0b478eb97] [formerly 9122b6da99] [formerly 8650074737 [formerly 9122b6da99 [formerly ba5ff870337c7ac66d633077d84de867e5df967c]]]]
Former-commit-id: 8650074737
Former-commit-id: bf5b777b0d [formerly 5e4c35e93f] [formerly b86eb15482eef7c6ed811b7be5a9d782dbcfa838 [formerly d3043fda5a]]
Former-commit-id: 97f709f323c3b2bc50eb72f596874288c2f388b5 [formerly a1ac082c94]
Former-commit-id: ad4ce67e85
|
2014-03-07 18:15:32 -06:00 |
|
Steve Harris
|
9c0f484340
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]]
Former-commit-id: f60aba35d6
Former-commit-id: edeb1833ae [formerly c24108e75b] [formerly dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]]
Former-commit-id: 5762fd74e7f2363c52a036a1f2863c4bad83bfa3 [formerly 61af779433]
Former-commit-id: ed7921643c
|
2014-03-07 15:43:40 -06:00 |
|
Steve Harris
|
3348f6857a
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]]
Former-commit-id: 40b543f9a8
Former-commit-id: a94f800324 [formerly 4d1fbf8743] [formerly b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046]]
Former-commit-id: 0b70d2b7739772b630136c56408866dc53a2bdcd [formerly ea01373320]
Former-commit-id: e29b96b6bd
|
2014-03-07 15:16:18 -06:00 |
|
Steve Harris
|
a19beb1e5d
|
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
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.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b [formerly 587f15a95d] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19]
Former-commit-id: 2db5dcf6eb
|
2014-03-06 08:39:43 -06:00 |
|
Max Schenkelberg
|
bee18f29d0
|
Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada
Former-commit-id: 4bcdc9f85b [formerly 6edfb8965f] [formerly dbcbd1b560] [formerly 4bcdc9f85b [formerly 6edfb8965f] [formerly dbcbd1b560] [formerly 1854bbb477 [formerly dbcbd1b560 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]]
Former-commit-id: 1854bbb477
Former-commit-id: c37910a689 [formerly bff80c3ee9] [formerly 64e66813ccc56d3b7a703a331fd119c8cbcceb08 [formerly 6658c94e6e]]
Former-commit-id: ac56a95b831199d75f4f7799c88a6cd9f119118f [formerly 96bdc00728]
Former-commit-id: 83103254e7
|
2014-03-03 17:59:48 -06:00 |
|
Nate Jensen
|
7d45344d05
|
Merge "Issue #2703 Fix GFE time matching in iscMode." into development
Former-commit-id: 3153786b6f [formerly b40f5477b4] [formerly 63244f840f] [formerly 3153786b6f [formerly b40f5477b4] [formerly 63244f840f] [formerly 908d308825 [formerly 63244f840f [formerly 252551462222ae8b7364ab39f1e927daec89a32c]]]]
Former-commit-id: 908d308825
Former-commit-id: 7ab7887199 [formerly fb68c4c07f] [formerly f763c6864aae7276537781234c118f3f876d018c [formerly 92527f1ffa]]
Former-commit-id: d76199bbbc5e0ea0744302003f49e6eeedb80d16 [formerly f0bb217f04]
Former-commit-id: 4e66e5bcc5
|
2014-02-28 09:53:27 -06:00 |
|
Richard Peter
|
ef2ff1d0f7
|
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 1d6e9816e0 [formerly 50a1b270c5] [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]]
Former-commit-id: 1916128dada6d785b45f3c66eda571278ddb03d7 [formerly 9b3f8f9649]
Former-commit-id: 5fab51d41b
|
2014-02-27 15:18:26 -06:00 |
|
Ben Steffensmeier
|
0de5a55243
|
Issue #2703 Fix GFE time matching in iscMode.
Former-commit-id: fa6dcaac84 [formerly 2425b9665c] [formerly d8bfdd1a7e] [formerly fa6dcaac84 [formerly 2425b9665c] [formerly d8bfdd1a7e] [formerly 07bc9f075f [formerly d8bfdd1a7e [formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]]]]
Former-commit-id: 07bc9f075f
Former-commit-id: 66b052cd5a [formerly 0fde78c595] [formerly 21789a864d2ed6b3a1c15882fe3f817dac2fd3f7 [formerly 804cbb48e6]]
Former-commit-id: e3dfae5839ecf10e3241d25f087585ecf760940a [formerly 6843396c78]
Former-commit-id: d899433612
|
2014-02-26 14:45:19 -06:00 |
|
Brian.Dyke
|
9db7ca881a
|
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 6b1b6d38e3 [formerly 73a1c238f4] [formerly c32d7953dc94373551f79bad9831cf9ef8cced7c [formerly 227131e5f1]]
Former-commit-id: b22adde77eff6179b00b4c7389d58bbde1684f4b [formerly 38829b9014]
Former-commit-id: 0bcf7c89b8
|
2014-02-24 14:51:00 -05:00 |
|
Ron Anderson
|
5eb76e8ed6
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962
Former-commit-id: 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]]
Former-commit-id: 2db5f26840
Former-commit-id: 5831f8d79e [formerly 7d3af157f8] [formerly a242c09c6983c820aa32c052d7deaed21a0982ec [formerly 3b2ea2d6ac]]
Former-commit-id: 50ec6dfad53c87f1ad4174e64fdb142803fcaf62 [formerly f2b0cc20e8]
Former-commit-id: 3c673caec2
|
2014-02-24 13:46:48 -06:00 |
|
Brian.Dyke
|
de9e6553a9
|
OB_14.1.1-19 baseline
Former-commit-id: 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]]
Former-commit-id: 10b723647b
Former-commit-id: 5a11fbbfdb [formerly c41dd22ff2] [formerly f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5]]
Former-commit-id: 8cf9beeb99ea9f03c45e09f6c11fba57ddab3585 [formerly 1b359c2564]
Former-commit-id: f86f9f8918
|
2014-02-21 06:50:59 -05:00 |
|
Ron Anderson
|
41a6f52eff
|
Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: 5f3248574f [formerly 663cb4cb62] [formerly 5258aecf45] [formerly 5f3248574f [formerly 663cb4cb62] [formerly 5258aecf45] [formerly 419e9d0b8d [formerly 5258aecf45 [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: 84bea14340 [formerly 908e43039e] [formerly ba993f1f22c77f61f4ea6ed8c28039e69d6a34b2 [formerly 8a41723ba6]]
Former-commit-id: a122ae5f46b63941580c026c45106c52001929d6 [formerly b0a4b63689]
Former-commit-id: e91fd1d683
|
2014-02-19 11:55:11 -06:00 |
|
Ron Anderson
|
c3b687b9a5
|
Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 8779564e3a [formerly 0135771eec] [formerly daf9f7ed0c92599e36d2d85d87483ca351cda108 [formerly d4ba9eba94]]
Former-commit-id: 55baedb811a56a020df3ba68f97e40ee6307fb4c [formerly 68e03bf02f]
Former-commit-id: 8a7af092f2
|
2014-02-18 10:45:20 -06:00 |
|
Steve Harris
|
a5d78a7f44
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 9fcc5ad930 [formerly 267cc881a4 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 1fbbb6e73f [formerly 146412a8bd] [formerly 4c759335f64413680ab7d7fe1fc420d460dacc98 [formerly e115197bb7]]
Former-commit-id: 3a7d7a0e21b09081b233b6aa8dcf49e018ef8486 [formerly 28aa3dd195]
Former-commit-id: 7805eac857
|
2014-02-17 08:54:34 -06:00 |
|
Ron Anderson
|
86f067bac9
|
Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]]
Former-commit-id: 2f067699f2
Former-commit-id: 4d8ebf6712 [formerly d9b82b4ebe] [formerly 3ebfa79176cc7f3e52da6c61f6bee73013042f0c [formerly 2d7c87ac84]]
Former-commit-id: d0c2bdea1752a1aeb905c70a45c12e3d9bda80dc [formerly d298aabe40]
Former-commit-id: 7447a71c10
|
2014-02-13 10:10:34 -06:00 |
|
Brian.Dyke
|
fc21d2dee4
|
14.1.1-18 baseline
Former-commit-id: 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1d6a9456b7 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: 1c7bf39f73 [formerly d61ae6c5f4] [formerly 57fbd21c8831f46d66fe301b77916657b0ab9f05 [formerly c5857c30f2]]
Former-commit-id: 48b7eeaa6cb834b10db17643ac629aaa112f6878 [formerly d1db845406]
Former-commit-id: f47dd3ef59
|
2014-02-11 15:52:50 -05:00 |
|
David Gillingham
|
cc3256e77a
|
Issue #2509: Fix baseline merge breakage to ifpIMAGE.
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00
Former-commit-id: dc8f0dde25 [formerly b12e29dd7c] [formerly 03d36b8309] [formerly dc8f0dde25 [formerly b12e29dd7c] [formerly 03d36b8309] [formerly e8ffc73893 [formerly 03d36b8309 [formerly 19e9a7f37409e37b378bf2f3eae0b9b16d797f65]]]]
Former-commit-id: e8ffc73893
Former-commit-id: 8cdf1ce158 [formerly ad8c40032f] [formerly bcf359e669db6d450eb89b007e4262c8f81e5b91 [formerly 94ec272ab2]]
Former-commit-id: 6d66a54db19d8e116fa26979efe8601acefd73a2 [formerly 06d68cc0be]
Former-commit-id: e20060f1da
|
2014-02-07 09:51:42 -06:00 |
|
Rici.Yu
|
eb9566903c
|
ASM #102
Change-Id: Idae87ce34f52bc79144742b92cff7e3537a84e99
Former-commit-id: 44656c81d9 [formerly 6c8fa82be2] [formerly 4010ef5fd8] [formerly 44656c81d9 [formerly 6c8fa82be2] [formerly 4010ef5fd8] [formerly 3bc070a8ec [formerly 4010ef5fd8 [formerly 6874b003afcebb837e11579eae048e2aa90cbfc7]]]]
Former-commit-id: 3bc070a8ec
Former-commit-id: 6d8b43f409 [formerly b35b74ca23] [formerly 5509a4c749f5f68a66da2385f84326060b3347d2 [formerly 7cd5b3e16d]]
Former-commit-id: 68519c4a7f967261ea3df84993a2ff540f21b2a5 [formerly eeb2d07c6c]
Former-commit-id: 2293b38bfd
|
2014-02-07 10:43:29 -05:00 |
|
Brian.Dyke
|
2bc1fcbaa2
|
Issue #83
Former-commit-id: 89422cef7c [formerly f2e56b268c] [formerly 484119f6b0] [formerly 89422cef7c [formerly f2e56b268c] [formerly 484119f6b0] [formerly fb15dd5dfb [formerly 484119f6b0 [formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]]]]
Former-commit-id: fb15dd5dfb
Former-commit-id: 8e78870c71 [formerly 3c160bb05e] [formerly 75d1cbbdb2e42e3d0ad9d5112f388174acbf50f1 [formerly f088dab5ef]]
Former-commit-id: 799ac9274e6dd53615f019c76b975281bd597c94 [formerly 870b355263]
Former-commit-id: 42e17bf5f3
|
2014-02-04 16:32:42 -05:00 |
|
Brian.Dyke
|
e0236cc20a
|
14.1.1-17 baseline
Former-commit-id: 4c6eb0c001 [formerly f3d34b0c38] [formerly 180d1356cd] [formerly 4c6eb0c001 [formerly f3d34b0c38] [formerly 180d1356cd] [formerly 23280af290 [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]]
Former-commit-id: 23280af290
Former-commit-id: 6e66bb7b6e [formerly f1cc9d6ee2] [formerly 50e190ed8cb3b89c055f33e543707eeb6346818a [formerly 947ec5fd96]]
Former-commit-id: b5864c63c56c26489ecbcefc3b1a67b8472182a1 [formerly 948fffa361]
Former-commit-id: b8f7317b9d
|
2014-02-04 12:33:46 -05:00 |
|
brian.dyke
|
4744c64069
|
merge 14.2.1-3 into asm-14.2.2
Former-commit-id: becf6322c6 [formerly 4a62e83835] [formerly f121ee384ae6474f6d0db204389a1736d5bede01 [formerly 2294c81a57]] [formerly becf6322c6 [formerly 4a62e83835] [formerly f121ee384ae6474f6d0db204389a1736d5bede01 [formerly 2294c81a57]] [formerly f10f6d4e8a [formerly 2294c81a57 [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: ac37e2ea2e [formerly 621464ac0d] [formerly 83bf7b38976fc3a19f898b0fe2c8e7790a8d7629 [formerly e9e2eb3be0]]
Former-commit-id: ee40d762efff70a1679bc3c2641d377b51facc3b [formerly dcf5f25ed1]
Former-commit-id: ca9263003a
|
2014-01-27 15:27:49 -05:00 |
|
Ben Steffensmeier
|
a4882ed82b
|
Issue #2703 Hook GFEResource into KML Export.
Change-Id: I3baeb829dec4fa650fa9cb86e4fe602b6ad47963
Former-commit-id: 39fae5c109 [formerly 48bb8a59a1] [formerly 1897336455] [formerly 39fae5c109 [formerly 48bb8a59a1] [formerly 1897336455] [formerly 7b1245b0cf [formerly 1897336455 [formerly 547e9ac7212b5a9842d064d5669772e8e50a4828]]]]
Former-commit-id: 7b1245b0cf
Former-commit-id: 467cd5a9f2 [formerly c9a89659c3] [formerly a5d0c33c597d28090b6fd7ad4486e862006ffc35 [formerly 76e76198d6]]
Former-commit-id: 3605fad36b6a47ce0cf1e3aadfe4f09856906975 [formerly d1781763ab]
Former-commit-id: 4b8491c85b
|
2014-01-23 18:43:14 -06:00 |
|
Ben Steffensmeier
|
559452967f
|
Issue #2312 Add extra frame selection option to GFE image export.
Change-Id: Ic62448c703e59a5318f361e141de7ffb65055f74
Former-commit-id: 744d199be6 [formerly 3196471d18] [formerly 81b38e2ddf] [formerly 744d199be6 [formerly 3196471d18] [formerly 81b38e2ddf] [formerly 4f9e60c658 [formerly 81b38e2ddf [formerly cb4db2bfd5a659c59d5c5e450c92207b3a81088c]]]]
Former-commit-id: 4f9e60c658
Former-commit-id: 5298304b65 [formerly 831d904de2] [formerly 9c47a4b5169c16e1c59ee4226a6eab5b09ec5636 [formerly 85eb694b23]]
Former-commit-id: e4cd4733d847dcc238c728acfadd0226e493678d [formerly 5dfa58dc98]
Former-commit-id: c20b169454
|
2014-01-22 16:53:04 -06:00 |
|
Steve Harris
|
0a5772e795
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
Former-commit-id: 56f5ae9f48 [formerly a465718a0d] [formerly 24ab7cff49] [formerly 56f5ae9f48 [formerly a465718a0d] [formerly 24ab7cff49] [formerly 69dc3d835b [formerly 24ab7cff49 [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]]
Former-commit-id: 69dc3d835b
Former-commit-id: 6cb92b1f57 [formerly b62efa9387] [formerly 24faa7a52a1fc22725c96c64ac33b0850b177a02 [formerly 252c7ee40a]]
Former-commit-id: 800d6b432a0b97ae5f3b770d37e08ca17eb7e05a [formerly 2a967fc9b5]
Former-commit-id: 69626ab704
|
2014-01-21 12:36:54 -06:00 |
|
Steve Harris
|
f8496662a0
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
Former-commit-id: 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 9371eeeee0 [formerly 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 9843517cb3 [formerly 7ea285c48b] [formerly 54d4fab62b427e6be3f978f3502c7e059e776520 [formerly 0ba307d616]]
Former-commit-id: 656727c4e55c34f4fb4a1128b81b68286b1e7757 [formerly b5f7f35ccb]
Former-commit-id: ccd2f6cdaa
|
2014-01-20 10:17:44 -06:00 |
|
gerritcm
|
e924818487
|
14.1.1-16 baseline
Former-commit-id: 57472968be [formerly 9e935404d8] [formerly 6be938e6eb] [formerly 57472968be [formerly 9e935404d8] [formerly 6be938e6eb] [formerly b84f7d4203 [formerly 6be938e6eb [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]]]]
Former-commit-id: b84f7d4203
Former-commit-id: c1df3eb55c [formerly b72cd19055] [formerly 8a149ceb12545503e179389c0569fad3eefaed15 [formerly 644da23327]]
Former-commit-id: d2214c65a6550cba23bc7837777ef6a2fc6d443a [formerly 5f79da2501]
Former-commit-id: 6bf3189db9
|
2014-01-16 16:43:05 -05:00 |
|
Rici.Yu
|
c34a37dc2e
|
Issue #92
Change-Id: Ib8d12e9be787c9b5b41a776eb22bb4c4a8c2fc7d
Former-commit-id: 18eec46389 [formerly f4fd057900] [formerly ac72d56ae0] [formerly 18eec46389 [formerly f4fd057900] [formerly ac72d56ae0] [formerly a36e9b3219 [formerly ac72d56ae0 [formerly c12f51881a565e2ec812e83e79b4bc59fbb5af1e]]]]
Former-commit-id: a36e9b3219
Former-commit-id: 84455e68d3 [formerly f9f5091cc1] [formerly ebd5aa7742786904da20f105c705310e23b5e040 [formerly 4b1ba5531f]]
Former-commit-id: 39d6035e705a77234eee8c02bb6163385191628a [formerly 33930381f7]
Former-commit-id: 2c327c27ac
|
2014-01-15 11:48:36 -05:00 |
|
Brian Clements
|
5754f15da4
|
Issue #2594 added low memory warning job
UiPlugin starts and stops job
job notifies perspective manager of low memory
Viz perspective manager has default alert implementation
D2D and GFE override alert message
added memory threshold property to product files
Former-commit-id: 8d6a469928 [formerly c63c8e2fc6] [formerly f9a8b68da5] [formerly 8d6a469928 [formerly c63c8e2fc6] [formerly f9a8b68da5] [formerly 0076ec9aaf [formerly f9a8b68da5 [formerly 4af42d405d3bf24b00c027f5dab8faf500a9e5b7]]]]
Former-commit-id: 0076ec9aaf
Former-commit-id: d53024b73f [formerly 496d15d77f] [formerly 99fc908864fba07455340f77fae46faf16981fcf [formerly e420ae009d]]
Former-commit-id: a57d8088ab7dc4c9a4fed5bd5802e7dfc0a73d06 [formerly dd0c5d9b57]
Former-commit-id: db92ac5b84
|
2014-01-14 17:05:28 -06:00 |
|
Ron Anderson
|
f33f5aec85
|
Merge branch 'master_14.1.1' into solutions
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]]
Former-commit-id: 62c445d872
Former-commit-id: 46735c9afe [formerly dca7f21f7b] [formerly 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e]]
Former-commit-id: 550b8ecf890edc1befc4cc61d160811052a5c599 [formerly 5076217d8f]
Former-commit-id: 77c132f706
|
2014-01-13 17:45:20 -06:00 |
|
Steve Harris
|
f8f17037ca
|
14.1.1-14 baseline
Former-commit-id: 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 4a516444b6 [formerly 0989c17710] [formerly 0c5e0a197ceb1a6b84da775143e65603564a8877 [formerly 43cc501e0d]]
Former-commit-id: a6acd13ea8d0052cec52c8cee5a726953d78e66e [formerly a2bdee5cc1]
Former-commit-id: 5862555160
|
2014-01-06 14:02:30 -05:00 |
|
Rici.Yu
|
326c17c1a7
|
Issue #86
Change-Id: Iccda23ba7bdfd0619adcd6333ae10f35dd1fdf7c
Former-commit-id: 0568c41fd6 [formerly 795cb798c6] [formerly 2b011e9ead] [formerly 0568c41fd6 [formerly 795cb798c6] [formerly 2b011e9ead] [formerly feda1354ca [formerly 2b011e9ead [formerly 38ae417a29d24e6ffc0f71cde94882989098903d]]]]
Former-commit-id: feda1354ca
Former-commit-id: f33765adab [formerly 5fa8bfa9fe] [formerly ad32bd19614226b8bfc30b661c191cf36d3b4716 [formerly f372d317b2]]
Former-commit-id: d27fcaa592cc842848a4b06793d551e2fa7b8c48 [formerly 4aad17e25d]
Former-commit-id: cc1e095b3f
|
2013-12-20 15:47:50 -05:00 |
|
David Gillingham
|
ec522d0ee0
|
Issue #2641: Fix ETN assignment issues introduced by baseline merge.
Former-commit-id: ab3f8b200a [formerly c48c0523ff] [formerly 136265183d] [formerly ab3f8b200a [formerly c48c0523ff] [formerly 136265183d] [formerly 09bfdc49e3 [formerly 136265183d [formerly 7ae8efacb3c886ec18af64dca7784f4aa1512bf4]]]]
Former-commit-id: 09bfdc49e3
Former-commit-id: f4dfa0efb1 [formerly 6e642b81fe] [formerly 54ef06cbf4b4c0bf6f652f24388beb4dfdf1db37 [formerly 8f3802eecf]]
Former-commit-id: 01fe09b5b4718cd40ed3a2ba5206139e1de68dcb [formerly 24c8fc930e]
Former-commit-id: 203e25ab3c
|
2013-12-18 16:18:47 -06:00 |
|
Richard Peter
|
08d2290f97
|
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 cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 73f12bf669 [formerly 5c0cf804f1] [formerly 2e1688da3b0fce728ce5f4d9180206023aa31cf3 [formerly 62fa535744]]
Former-commit-id: 3e8093536581ac6595438ca5eb497ae394fe30e8 [formerly 4059813742]
Former-commit-id: 1c743d4d44
|
2013-12-17 21:04:53 -06:00 |
|
Steve Harris
|
e242b041ad
|
14.1.1-13 baseline
Former-commit-id: a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly b0b55a676b [formerly c88b10039a [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]]
Former-commit-id: b0b55a676b
Former-commit-id: 690b177ded [formerly 5368f23247] [formerly afbe4db73cf4d0b084a0f0de6518f4b936da3cee [formerly 61d4adc979]]
Former-commit-id: 0ea21b66b82286c758014c97bc2a1696ff006efb [formerly ff08301890]
Former-commit-id: 800136d61b
|
2013-12-12 16:59:57 -05:00 |
|
Richard Peter
|
f362062048
|
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
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.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 530b3bd588 [formerly 60679a818a] [formerly a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4]]
Former-commit-id: 53e9784af497b834229cb70070f6499791f6f567 [formerly fd93b7d85e]
Former-commit-id: ae6e34be4b
|
2013-12-05 12:12:27 -06:00 |
|