Steve Harris
|
07363394a1
|
Merge tag 'OB_14.4.1-14m' into omaha_15.1.1
14.4.1-14
Former-commit-id: cdca3c5b9eb65bed9d773019917245d1000d78dd
|
2015-03-02 10:58:40 -06:00 |
|
AWIPS User
|
ea30abe01b
|
merge upc development orphan branch into upc_14.4.1
Former-commit-id: 4458299928 [formerly 06a7f2ad9d] [formerly 1f4613a97ecb170f991ddd5ca9be32b5c63945b0 [formerly c9f28fd594]]
Former-commit-id: 76393e9e3ea8a386189eecfc4953a49d04ba95df [formerly 892c265b12]
Former-commit-id: 1ac670fc00
|
2015-03-01 12:44:45 -07:00 |
|
Fay.Liang
|
aa23d1797c
|
Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 6b09ea0d2f [formerly da2f15f749] [formerly 94a7507b9b] [formerly 6b09ea0d2f [formerly da2f15f749] [formerly 94a7507b9b] [formerly 47882c9ca1 [formerly 94a7507b9b [formerly d6d761a5170a91dbd6fed78af582bfc2a8f662a3]]]]
Former-commit-id: 47882c9ca1
Former-commit-id: 4075740437 [formerly a54a056c67] [formerly c0c98737dc4e3935da47a3c042681411232be7ca [formerly 7ff67d57da]]
Former-commit-id: 22c1cde65e749055463a9fbe0344c2ca55a9e05f [formerly ed78e2d716]
Former-commit-id: cb60c82771
|
2015-02-24 14:56:50 -05:00 |
|
Fay.Liang
|
94a7507b9b
|
Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: d6d761a5170a91dbd6fed78af582bfc2a8f662a3
|
2015-02-24 14:56:50 -05:00 |
|
Fay.Liang
|
6b09ea0d2f
|
Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 47882c9ca1 [formerly 94a7507b9b [formerly d6d761a5170a91dbd6fed78af582bfc2a8f662a3]]
Former-commit-id: 94a7507b9b
Former-commit-id: da2f15f749
|
2015-02-24 14:56:50 -05:00 |
|
Darrel Kingfield
|
00880112ba
|
VLab Issue #6585 - MRMS Menu Activation for 14.4.1; fixes #6585
Former-commit-id: f43b83069eaf12e4190f1827eeed8d954239b164
|
2015-02-24 10:14:35 -06:00 |
|
Darrel Kingfield
|
7d83a053fd
|
VLab Issue #6585 - MRMS Menu Activation for 14.4.1; fixes #6585
Former-commit-id: d73e7e2d8b [formerly 00880112ba [formerly f43b83069eaf12e4190f1827eeed8d954239b164]]
Former-commit-id: 00880112ba
Former-commit-id: 41ece8fea1
|
2015-02-24 10:14:35 -06:00 |
|
Darrel Kingfield
|
52cb3becc5
|
VLab Issue #6585 - MRMS Menu Activation for 14.4.1; fixes #6585
Former-commit-id: 7d83a053fd [formerly 41ece8fea1] [formerly 00880112ba] [formerly 7d83a053fd [formerly 41ece8fea1] [formerly 00880112ba] [formerly d73e7e2d8b [formerly 00880112ba [formerly f43b83069eaf12e4190f1827eeed8d954239b164]]]]
Former-commit-id: d73e7e2d8b
Former-commit-id: 9e7ab4a1e9 [formerly 31ee025ea6] [formerly da43204f724bb40645e61f9b23ef361ef2b9a4f9 [formerly e19974b779]]
Former-commit-id: 6645f64cc7b7697601139f2428df86c8fe954820 [formerly d558124cd4]
Former-commit-id: fbf2c0047c
|
2015-02-24 10:14:35 -06:00 |
|
Ana Rivera
|
861a749706
|
VLab Issue #6432 - EKDMOS: add entries for CONUS and AK in gribModels_NCEP-7.xml; fixes #6432
Change-Id: I3596da11343b453b2c9f48d4a3e271f19228197a
Former-commit-id: 9242a49a1a688379c625ee93af21e98a007470b0
|
2015-02-23 21:21:25 +00:00 |
|
Ana Rivera
|
53827a030a
|
VLab Issue #6432 - EKDMOS: add entries for CONUS and AK in gribModels_NCEP-7.xml; fixes #6432
Change-Id: I3596da11343b453b2c9f48d4a3e271f19228197a
Former-commit-id: 14ee6d9e50 [formerly 861a749706 [formerly 9242a49a1a688379c625ee93af21e98a007470b0]]
Former-commit-id: 861a749706
Former-commit-id: 19a47ab731
|
2015-02-23 21:21:25 +00:00 |
|
Ana Rivera
|
9d8e20a1eb
|
VLab Issue #6432 - EKDMOS: add entries for CONUS and AK in gribModels_NCEP-7.xml; fixes #6432
Change-Id: I3596da11343b453b2c9f48d4a3e271f19228197a
Former-commit-id: 53827a030a [formerly 19a47ab731] [formerly 861a749706] [formerly 53827a030a [formerly 19a47ab731] [formerly 861a749706] [formerly 14ee6d9e50 [formerly 861a749706 [formerly 9242a49a1a688379c625ee93af21e98a007470b0]]]]
Former-commit-id: 14ee6d9e50
Former-commit-id: 8e50ec12e9 [formerly 129151d1fb] [formerly 29ac6a947c3291bb65ac0322483e1d2580a02ef8 [formerly 7f6675f6b7]]
Former-commit-id: 4c93283e1342fb8589d5471ab7bdb0e5d79077f9 [formerly a7894fbe7d]
Former-commit-id: 022a246bdc
|
2015-02-23 21:21:25 +00:00 |
|
Ana Rivera
|
0e90c25595
|
VLab Issue #6432 - EKDMOS: update grib.xml; rename GribModel:7:14:114; fixes #6432
Change-Id: Ie2041a6e46cf421fc5ecafce49836007847855ac
Former-commit-id: a5fc4d46bff38ecab9c9019c5184fae99a6ecc90
|
2015-02-23 15:56:58 +00:00 |
|
Ana Rivera
|
b9f9e5616d
|
VLab Issue #6432 - EKDMOS: update grib.xml; rename GribModel:7:14:114; fixes #6432
Change-Id: Ie2041a6e46cf421fc5ecafce49836007847855ac
Former-commit-id: 1a7cde7f53 [formerly 0e90c25595 [formerly a5fc4d46bff38ecab9c9019c5184fae99a6ecc90]]
Former-commit-id: 0e90c25595
Former-commit-id: 98ead02564
|
2015-02-23 15:56:58 +00:00 |
|
Ana Rivera
|
0f298cfabb
|
VLab Issue #6432 - EKDMOS: update grib.xml; rename GribModel:7:14:114; fixes #6432
Change-Id: Ie2041a6e46cf421fc5ecafce49836007847855ac
Former-commit-id: b9f9e5616d [formerly 98ead02564] [formerly 0e90c25595] [formerly b9f9e5616d [formerly 98ead02564] [formerly 0e90c25595] [formerly 1a7cde7f53 [formerly 0e90c25595 [formerly a5fc4d46bff38ecab9c9019c5184fae99a6ecc90]]]]
Former-commit-id: 1a7cde7f53
Former-commit-id: 6219ea5d10 [formerly 18779d0dbd] [formerly d5895084c5e5ce15bd1285754fc806c1df945111 [formerly fdcd836cd9]]
Former-commit-id: 07f2b8017f84f2202f685500ef7e59d3459202b8 [formerly 8061496043]
Former-commit-id: 64d67b4b8a
|
2015-02-23 15:56:58 +00:00 |
|
Ana Rivera
|
ce6241f01a
|
VLab Issue #6432 - Rename GribModel:7:14:114 as EKDMOS; fixes #6432
Change-Id: I9c750ee1970de2705abec0fb806babbcd32c512c
Former-commit-id: f747715fb7479dcaf0bfd0849ca4a96e8b99dad5
|
2015-02-20 20:04:56 +00:00 |
|
Ana Rivera
|
7982aba305
|
VLab Issue #6432 - Rename GribModel:7:14:114 as EKDMOS; fixes #6432
Change-Id: I9c750ee1970de2705abec0fb806babbcd32c512c
Former-commit-id: 3877625b2f [formerly ce6241f01a [formerly f747715fb7479dcaf0bfd0849ca4a96e8b99dad5]]
Former-commit-id: ce6241f01a
Former-commit-id: 556e163629
|
2015-02-20 20:04:56 +00:00 |
|
Ana Rivera
|
5e372f13f1
|
VLab Issue #6432 - Rename GribModel:7:14:114 as EKDMOS; fixes #6432
Change-Id: I9c750ee1970de2705abec0fb806babbcd32c512c
Former-commit-id: 7982aba305 [formerly 556e163629] [formerly ce6241f01a] [formerly 7982aba305 [formerly 556e163629] [formerly ce6241f01a] [formerly 3877625b2f [formerly ce6241f01a [formerly f747715fb7479dcaf0bfd0849ca4a96e8b99dad5]]]]
Former-commit-id: 3877625b2f
Former-commit-id: bb49ce57d2 [formerly a654404457] [formerly f30acb33563dc261b54ddfb788a6949fe73fff8e [formerly 73da7c1783]]
Former-commit-id: ff58b1e7a5cda5dd4b1edb8f668bf85ec1c2dc8c [formerly 9c97956ff9]
Former-commit-id: a581ee41b8
|
2015-02-20 20:04:56 +00:00 |
|
Roger Ferrel
|
64d76144f1
|
Omaha #4053 Added Great Lakes Wave Model 2.5KM to product browser, volume browser and GFE.
Change-Id: Iabb0b401a51e7fbb069ed8c6e7b44e2d9382c421
Former-commit-id: 66098b89fcf6cd5bcf950024c5a40722018b02d5
|
2015-02-12 13:43:37 -06:00 |
|
Shawn.Hooper
|
0ac88acf05
|
ASM #17100 - Revert "VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563"
This reverts commit bf5bb1bacf [formerly 5189ae1c3ce12320045c431d9552036ea9272cef].
Change-Id: Ie8d46f14aab90286a5562e6b79cd7dfabceb33c0
Former-commit-id: 0ed82706fda1158292e6f789cceea378f5879e37
|
2015-02-05 10:30:29 -05:00 |
|
Shawn.Hooper
|
a125ba732a
|
ASM #17100 - Revert "VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563"
This reverts commit 52f4873f3f [formerly cbc7d2813f] [formerly bf5bb1bacf] [formerly bfc550b378 [formerly bf5bb1bacf [formerly 5189ae1c3ce12320045c431d9552036ea9272cef]]].
Change-Id: Ie8d46f14aab90286a5562e6b79cd7dfabceb33c0
Former-commit-id: fa9e3791cb [formerly 0ac88acf05 [formerly 0ed82706fda1158292e6f789cceea378f5879e37]]
Former-commit-id: 0ac88acf05
Former-commit-id: 9c9bb841ca
|
2015-02-05 10:30:29 -05:00 |
|
Steve Harris
|
85457e37cb
|
Merge tag 'OB_14.4.1-7m' into omaha_15.1.1
14.4.1-7
Former-commit-id: bf0368503a8defd41a20e369e154d560b93bee6c
|
2015-02-03 17:30:23 -06:00 |
|
Steve Harris
|
8cd98ea3b9
|
Merge tag 'OB_14.4.1-6m' into omaha_15.1.1
14.4.1-6
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 9fd5ed1aea1a667552144da88dcc394a99133c52
|
2015-02-03 12:25:05 -06:00 |
|
Fay.Liang
|
ae85ade54d
|
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 06a34c609a217ca98b027ac6d92a31faf802b668
|
2015-02-03 11:24:57 -05:00 |
|
Fay.Liang
|
eafbc466a4
|
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: f1c34884a5 [formerly ae85ade54d [formerly 06a34c609a217ca98b027ac6d92a31faf802b668]]
Former-commit-id: ae85ade54d
Former-commit-id: 5550322f62
|
2015-02-03 11:24:57 -05:00 |
|
Fay.Liang
|
241eba4a05
|
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: eafbc466a4 [formerly 5550322f62] [formerly ae85ade54d] [formerly eafbc466a4 [formerly 5550322f62] [formerly ae85ade54d] [formerly f1c34884a5 [formerly ae85ade54d [formerly 06a34c609a217ca98b027ac6d92a31faf802b668]]]]
Former-commit-id: f1c34884a5
Former-commit-id: 3f1e57ac13 [formerly 7ac4ff3f48] [formerly 87259344c87456b2e79b92767744947da2f8575a [formerly 82b3637598]]
Former-commit-id: 349eeb1f68c792e29ee19136353a5a6cbd392309 [formerly 37f830c123]
Former-commit-id: 7f3a53beaf
|
2015-02-03 11:24:57 -05:00 |
|
Ana Rivera
|
ea92049aac
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: d5996a81aad0809aaddbb8df99a985c86c66aaf8
|
2015-01-30 19:29:29 +00:00 |
|
Ana Rivera
|
2be03903bc
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: 070f0136ec [formerly ea92049aac [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]
Former-commit-id: ea92049aac
Former-commit-id: ccd0a40621
|
2015-01-30 19:29:29 +00:00 |
|
Ana Rivera
|
24e1be0580
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: 2be03903bc [formerly ccd0a40621] [formerly ea92049aac] [formerly 2be03903bc [formerly ccd0a40621] [formerly ea92049aac] [formerly 070f0136ec [formerly ea92049aac [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]]]
Former-commit-id: 070f0136ec
Former-commit-id: c5182d351e [formerly e358377ca7] [formerly 83f5ea939fdc2f3bd6430413f7c32ec2de4681c6 [formerly 1bbb9bad78]]
Former-commit-id: 5a5444cf3e777acf29e90a268647565f4755def7 [formerly 0715e923df]
Former-commit-id: 7cea67cfc6
|
2015-01-30 19:29:29 +00:00 |
|
Steve Harris
|
995d60fb54
|
Merge tag 'OB_14.4.1-5m' into omaha_15.1.1
14.4.1-5
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 28075dabb4b6421ddaee3af71518f565d9bc7e90
|
2015-01-28 13:45:36 -06:00 |
|
Ana Rivera
|
8bfa7c4087
|
Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40
Former-commit-id: 291d66c66af4f1f4d298185412d5930714ffb2c5
|
2015-01-27 22:05:59 +00:00 |
|
Ana Rivera
|
ed61c52ee3
|
Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40
Former-commit-id: 20ad0a65f3 [formerly 8bfa7c4087 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]]
Former-commit-id: 8bfa7c4087
Former-commit-id: 4071b58b85
|
2015-01-27 22:05:59 +00:00 |
|
Ana Rivera
|
8ab81cc28a
|
Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40
Former-commit-id: ed61c52ee3 [formerly 4071b58b85] [formerly 8bfa7c4087] [formerly ed61c52ee3 [formerly 4071b58b85] [formerly 8bfa7c4087] [formerly 20ad0a65f3 [formerly 8bfa7c4087 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]]]]
Former-commit-id: 20ad0a65f3
Former-commit-id: f92cfb0f40 [formerly de74e8a90d] [formerly 442a60d056ccadc0eef6f172e33926ab71037b10 [formerly 3696a3a1d1]]
Former-commit-id: dbb1d85007537eb63770397a06174c0f4b1b1206 [formerly 0af5d55eb6]
Former-commit-id: cf29758096
|
2015-01-27 22:05:59 +00:00 |
|
Ana Rivera
|
854a203107
|
Merge branch 'master_14.4.1' into emc_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1
Former-commit-id: 48cb3fd143 [formerly 654d08a588] [formerly 98ac97e397] [formerly 48cb3fd143 [formerly 654d08a588] [formerly 98ac97e397] [formerly 7c25945fd9 [formerly 98ac97e397 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]]]]
Former-commit-id: 7c25945fd9
Former-commit-id: cecf9e2ef6 [formerly d6630d8f35] [formerly 0612a8075112c53ca561737244fdc42031bbb44c [formerly eae1bd317d]]
Former-commit-id: bb15a8f43d38e1956b090806df98b75978f14292 [formerly cd2841195b]
Former-commit-id: aa04bff454
|
2015-01-26 18:45:26 +00:00 |
|
Ana Rivera
|
98ac97e397
|
Merge branch 'master_14.4.1' into emc_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1
Former-commit-id: 51ef304bd94fd003a1e7349a22c41e21b340ac8a
|
2015-01-26 18:45:26 +00:00 |
|
Ana Rivera
|
48cb3fd143
|
Merge branch 'master_14.4.1' into emc_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1
Former-commit-id: 7c25945fd9 [formerly 98ac97e397 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]]
Former-commit-id: 98ac97e397
Former-commit-id: 654d08a588
|
2015-01-26 18:45:26 +00:00 |
|
David Gillingham
|
41af2f661c
|
Omaha #4014: Add ingest and display support for ETSS model.
Change-Id: I5bff5985d779a9d665cbe5a005171b2076212846
Former-commit-id: fa7e11a22b47a48d2bc7b9cf6f0ddfd97ea2fea7
|
2015-01-20 14:02:06 -06:00 |
|
mjames-upc
|
60abf0affc
|
various cleanup merge remotes/origin/ncep_14.4.1 to upc dev
Former-commit-id: 965f752233
|
2015-01-12 16:11:06 -07:00 |
|
mjames-upc
|
9fb01d9d75
|
modified code EDEX - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: a5f1222765
|
2015-01-12 14:07:45 -07:00 |
|
mjames-upc
|
886cd5940f
|
Additions and deletions - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: 7eacf4dc1c
|
2015-01-12 14:02:58 -07:00 |
|
mjames-upc
|
b50e95b077
|
CMC, FNMOC, NAM-5km, NAM-32km, NAM243 grid support added/updated
Former-commit-id: 042a601d8a
|
2014-12-29 15:32:20 -07:00 |
|
Joshua Watson
|
3f2f7f2f3a
|
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29
|
2014-12-17 08:38:27 -05:00 |
|
Joshua Watson
|
cf1882cc44
|
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: 5aa4748569 [formerly 3f2f7f2f3a [formerly 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29]]
Former-commit-id: 3f2f7f2f3a
Former-commit-id: 0c375981e7
|
2014-12-17 08:38:27 -05:00 |
|
Joshua Watson
|
ef7dbe8735
|
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: cf1882cc44 [formerly 0c375981e7] [formerly 3f2f7f2f3a] [formerly cf1882cc44 [formerly 0c375981e7] [formerly 3f2f7f2f3a] [formerly 5aa4748569 [formerly 3f2f7f2f3a [formerly 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29]]]]
Former-commit-id: 5aa4748569
Former-commit-id: e419cebdea [formerly 1040be8594] [formerly acf20dd93b57335f5216ef543b921227c78af2eb [formerly 094e8048e9]]
Former-commit-id: 7dccfd850e0304ac1124ea5b96ef03ed520b2f03 [formerly eb68dac32d]
Former-commit-id: 8dd62191ae
|
2014-12-17 08:38:27 -05:00 |
|
Ana Rivera
|
043bc3a8b7
|
Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129, #5421, #5345.
Conflicts:
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895
Former-commit-id: 111ae763e6becb944e34e262e1d87d2d344236e4
|
2014-12-16 23:39:02 +00:00 |
|
Ana Rivera
|
1f5dd0c92b
|
Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129, #5421, #5345.
Conflicts:
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895
Former-commit-id: 1823ed3596 [formerly 043bc3a8b7 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]
Former-commit-id: 043bc3a8b7
Former-commit-id: 214be0a93b
|
2014-12-16 23:39:02 +00:00 |
|
Ana Rivera
|
769df60be8
|
Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129, #5421, #5345.
Conflicts:
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895
Former-commit-id: 1f5dd0c92b [formerly 214be0a93b] [formerly 043bc3a8b7] [formerly 1f5dd0c92b [formerly 214be0a93b] [formerly 043bc3a8b7] [formerly 1823ed3596 [formerly 043bc3a8b7 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]]]
Former-commit-id: 1823ed3596
Former-commit-id: 90efb445f0 [formerly ef35771bfa] [formerly df1f34b8c00ffdaeec21c1d4b59bdc4ae9648cb2 [formerly d2d8127363]]
Former-commit-id: d7532e0824a0a0330656fbdab24737f609c2a10f [formerly f7c0319ee4]
Former-commit-id: 40df82b005
|
2014-12-16 23:39:02 +00:00 |
|
Ana Rivera
|
2eec9d9557
|
VLab Issue #4365 Decode Ensemble Kernel Density MOS (EKDMOS); fixes 4365
Change-Id: I1272721f43ee78b310fcf74227317cf27e8d6b28
Former-commit-id: cb236c208fe6489f88144adab3178dccd4a826db
|
2014-12-16 16:39:22 +00:00 |
|
Ana Rivera
|
4fa0956af3
|
VLab Issue #4365 Decode Ensemble Kernel Density MOS (EKDMOS); fixes 4365
Change-Id: I1272721f43ee78b310fcf74227317cf27e8d6b28
Former-commit-id: dcf5dc2173 [formerly 2eec9d9557 [formerly cb236c208fe6489f88144adab3178dccd4a826db]]
Former-commit-id: 2eec9d9557
Former-commit-id: 15f81a3bc7
|
2014-12-16 16:39:22 +00:00 |
|
Ana Rivera
|
2dcafaed98
|
VLab Issue #4365 Decode Ensemble Kernel Density MOS (EKDMOS); fixes 4365
Change-Id: I1272721f43ee78b310fcf74227317cf27e8d6b28
Former-commit-id: 4fa0956af3 [formerly 15f81a3bc7] [formerly 2eec9d9557] [formerly 4fa0956af3 [formerly 15f81a3bc7] [formerly 2eec9d9557] [formerly dcf5dc2173 [formerly 2eec9d9557 [formerly cb236c208fe6489f88144adab3178dccd4a826db]]]]
Former-commit-id: dcf5dc2173
Former-commit-id: d73f27d59f [formerly e4ad9d5e28] [formerly 62bcd6efd0bb1a5e476611798448818f8e125d0a [formerly 09a9b3491c]]
Former-commit-id: 03a912f4d025094d56f4f0aa6e6f4cddb7de8259 [formerly c406ea45b9]
Former-commit-id: 2e8628f836
|
2014-12-16 16:39:22 +00:00 |
|
Joshua Watson
|
a8f5bb480b
|
VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840
Former-commit-id: cfce2a5f633a7312b9ad64dafb559c834b0ceddf
|
2014-12-11 11:39:00 -05:00 |
|