Richard Peter
|
721227f28f
|
Omaha #4468 - Fix gribDatasets_NCEP-7.xml typos
Change-Id: I5cd8f130c86cde73b88b75017cc46dce7dbaed34
Former-commit-id: c0cc6d7365 [formerly a88520a94e [formerly 3185ab93ef9d1ba7efbd59f24cc3c8a270938853]]
Former-commit-id: a88520a94e
Former-commit-id: 0359d60e22
|
2015-05-06 09:17:50 -05:00 |
|
David Gillingham
|
7fe1a980ba
|
Omaha #4384: Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser.
Change-Id: I17ebbd913a17e158898a27b83e342f08ade610d6
Former-commit-id: c01694607f [formerly b13f8c7794 [formerly 09d7c45466f2fad8df8142bcbf0ded2e3757ffcb]]
Former-commit-id: b13f8c7794
Former-commit-id: 2e3b98f02f
|
2015-04-09 13:26:52 -05:00 |
|
Fay.Liang
|
21e976596e
|
Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 6293139493 [formerly e3f07916ea [formerly 3b4b5c100cc6972beff6e22a609f069f97bdc765]]
Former-commit-id: e3f07916ea
Former-commit-id: 7997322bb4
|
2015-03-13 16:03:02 -04:00 |
|
Tiffany Meyer
|
8ca580f756
|
VLab Issue #6834 - MRMS Sub-gridding velocity patch; fixes #6834
Former-commit-id: df86b25aa9 [formerly 62b8b3a30c [formerly 639a67e0ff96c5ea23613a75071017ecf86085c8]]
Former-commit-id: 62b8b3a30c
Former-commit-id: 19f2e097ce
|
2015-03-10 09:42:14 -05:00 |
|
Fay.Liang
|
1138f48ee9
|
Merge tag 'OB_14.3.2-19m' into master_14.4.1
14.3.2-19m
Conflicts:
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 0e475cb704 [formerly 059eb032b1 [formerly 4b3626307cf35ada45985c25cf062e7b857db764]]
Former-commit-id: 059eb032b1
Former-commit-id: a9945f1981
|
2015-03-09 16:11:13 -04:00 |
|
Fay.Liang
|
559106e551
|
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: bafd1eb2db [formerly 2cdb454dc0 [formerly c127d4bd2f42a22d91e9a0517a6d0e8b17198d6b]]
Former-commit-id: 2cdb454dc0
Former-commit-id: cc627997a8
|
2015-03-05 10:41:04 -05:00 |
|
Joshua Watson
|
3d500422e1
|
VLab Issue #6684 - Fixed parameter abbrev in derived parameter CONVP2hr.xml and fixed grib table entry in grib/tables/7/14/4.2.0.19.table; fixes #6684
Change-Id: Ibcfe705b56cc4112da732c46eb17d52f9a4a6df7
Former-commit-id: ac92410d39 [formerly 7fc4a6f2ae [formerly 5a0b0653e28f31a080eec2123386359691c4b1fd]]
Former-commit-id: 7fc4a6f2ae
Former-commit-id: 845e1557e5
|
2015-03-02 12:10:07 -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
|
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 |
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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 |
|
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 |
|
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
|
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 |
|
Joshua Watson
|
0d02d676b4
|
VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840
Former-commit-id: bca4b40eed [formerly a8f5bb480b [formerly cfce2a5f633a7312b9ad64dafb559c834b0ceddf]]
Former-commit-id: a8f5bb480b
Former-commit-id: 0c8b629c96
|
2014-12-11 11:39:00 -05:00 |
|
Roger Ferrel
|
bc889a1b6b
|
Omaha #3658 Scale arrows and use consistent units.
Change-Id: I7a627b015d2806e8456dd77e0eae679bbd370899
Former-commit-id: 64b8d193f4 [formerly 5d91f976af [formerly 0f0eafd8687edc0c10ef21495175f1e68f926577]]
Former-commit-id: 5d91f976af
Former-commit-id: faea9e0ddc
|
2014-12-05 11:54:27 -06:00 |
|
Roger Ferrel
|
9987f2c6b0
|
Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region.
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a
Former-commit-id: 597fdb8280 [formerly 462e0d85c0 [formerly 46d3bbcc99d93845dcb159012b872fe746756b7c]]
Former-commit-id: 462e0d85c0
Former-commit-id: 24c969a249
|
2014-12-04 12:52:22 -06:00 |
|
Ana Rivera
|
00c85ffff1
|
VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f
Former-commit-id: fe5bfbaa73 [formerly 709d571947 [formerly 6866439b0a7075f04146af4b4bdce59477269f4d]]
Former-commit-id: 709d571947
Former-commit-id: edfb394f22
|
2014-12-02 15:44:07 +00:00 |
|
Ana Rivera
|
8e7de741ae
|
VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
This reverts commit 3e6ab19015 [formerly 53b96c2b8e] [formerly c245f3a3c4] [formerly f1f5f2c717 [formerly c245f3a3c4 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]].
Change-Id: I631bb1722abea96e08967a8d9fa9f175a886f685
Former-commit-id: 5abf37ea62 [formerly 0e8473e91e [formerly 373acfce57d5e0044f13382b926cb2fc1f830e54]]
Former-commit-id: 0e8473e91e
Former-commit-id: eb0253f820
|
2014-12-02 13:43:03 +00:00 |
|
Richard Peter
|
d20acff80d
|
Merge "Omaha #3870 Updated table to include missing elements." into omaha_14.4.1
Former-commit-id: 6759ffa76c [formerly 6d046826dc [formerly e7056504ae5758e2b4abbdef9cec7b2467d49add]]
Former-commit-id: 6d046826dc
Former-commit-id: 1a88edfa4f
|
2014-11-26 10:13:40 -06:00 |
|
Roger Ferrel
|
2e11707856
|
Omaha #3870 Updated table to include missing elements.
Former-commit-id: fedc4aae8a [formerly c4cf624d04 [formerly 7569e4f2b962d22453b7414ea882f2383cec9ade]]
Former-commit-id: c4cf624d04
Former-commit-id: 0ae4219196
|
2014-11-25 14:31:05 -06:00 |
|
Roger Ferrel
|
cebf9ec3fd
|
Omaha #3866 Configuration files for GFS20KM for product and volume browsers.
Former-commit-id: 0df840602e [formerly 9b986c7cf8 [formerly 56833ab1b84e50c6ca4150d3c90501448233313b]]
Former-commit-id: 9b986c7cf8
Former-commit-id: da25f4588d
|
2014-11-25 10:01:30 -06:00 |
|
Evan Polster
|
a4c572aa7d
|
Merge "VLab Issue #5069 Files for DR 14006." into gsd_14.4.1
Former-commit-id: b7b2087e1f [formerly 78a4d3425b [formerly f0d0953f6fe1bc6d2ace9dce159a6354a2c55264]]
Former-commit-id: 78a4d3425b
Former-commit-id: 82523e7ef1
|
2014-11-21 13:30:59 -05:00 |
|
Ana Rivera
|
d503800c3e
|
Merge branch 'master_14.4.1' into emc_14.4.1
Change-Id: I4984b06810f3484e919a4a4a5853435ca34167bb
Former-commit-id: 1999049d90 [formerly 1645ccd9ca [formerly c69e94f227cb908a9af2e1cd2db35b25bef28701]]
Former-commit-id: 1645ccd9ca
Former-commit-id: 02e630bc93
|
2014-11-21 14:23:49 +00:00 |
|
Steve Harris
|
79a5171143
|
Merge tag 'OB_14.3.1-32m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/build.edex/esb/conf/logback-ingest.xml
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
Former-commit-id: 9de825c332 [formerly a16abe1b8b [formerly 565efec2ebe5a3a1a009d213a77617f4a593aa6b]]
Former-commit-id: a16abe1b8b
Former-commit-id: a8a97501ac
|
2014-11-10 08:42:01 -06:00 |
|
Brian.Dyke
|
5cdd9f4256
|
Merge branch 'master_14.2.4' into master_14.3.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: acf00264f4 [formerly aae68215c8 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]
Former-commit-id: aae68215c8
Former-commit-id: 4ac24af0a9
|
2014-11-06 12:55:21 -05:00 |
|
Jim Ramer
|
65a241c320
|
VLab Issue #5069
Files for DR 14006.
Former-commit-id: e9b971471a [formerly e35ac6eeca [formerly c41dcab19a03ea315d6d77128208f65d839c6aec]]
Former-commit-id: e35ac6eeca
Former-commit-id: 77800e1a75
|
2014-10-23 15:30:37 -06:00 |
|
Ana Rivera
|
3e6ab19015
|
VLab Issue #5034 - Ingest and Display NWPS model data; fixes #5034
Change-Id: I836ffda083281073f5cf1d20de79f73091d49426
Former-commit-id: f1f5f2c717 [formerly c245f3a3c4 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]
Former-commit-id: c245f3a3c4
Former-commit-id: 53b96c2b8e
|
2014-10-22 17:03:07 +00:00 |
|
Steve Harris
|
f5b5d2bca2
|
Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
Former-commit-id: bfade7674d [formerly dc557b2d0c [formerly ea787b645974850607658e5a7dfc4a072d831a3b]]
Former-commit-id: dc557b2d0c
Former-commit-id: e9c9a17f96
|
2014-10-22 11:45:39 -05:00 |
|
Brian.Dyke
|
aa47e1edb8
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 0d5f2c0add [formerly c60124fa61 [formerly ea0a81b12c7b1a0154361d97882ef65fc55b20e1]]
Former-commit-id: c60124fa61
Former-commit-id: 7f719d0124
|
2014-10-16 11:21:39 -04:00 |
|
Nate Jensen
|
31e5ac66b4
|
Omaha #3730 export postprocessors package
Change-Id: Ie87558540777c1cea7354b040e386ba67f835311
Former-commit-id: d5a5d55265 [formerly 5dd168e76a [formerly db613b63005c2763ca94851182042867aedd43c9]]
Former-commit-id: 5dd168e76a
Former-commit-id: 2fc8887e08
|
2014-10-15 14:46:12 -05:00 |
|
Steve Harris
|
53dc9657e2
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 2db03d95b3 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]
Former-commit-id: 39c5e9c314
Former-commit-id: 06a27b2d3c
|
2014-10-06 13:57:59 -05:00 |
|
Darrel Kingfield
|
2a258e5db6
|
VLab Issue #4922 - Rotation Tracks patch check-in
Former-commit-id: aa168071aa [formerly 8113b2ba69 [formerly 48565726c39ea8139d4a3dfd505732cee2d32b16]]
Former-commit-id: 8113b2ba69
Former-commit-id: 66dcc60acf
|
2014-10-06 10:01:36 -05:00 |
|
Brian.Dyke
|
06f6dfc38a
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: f3f95aabb0 [formerly 65ad6056b6 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]
Former-commit-id: 65ad6056b6
Former-commit-id: 006bdb00ad
|
2014-10-02 10:38:51 -04:00 |
|
Slav Korolev
|
5aa180c0cc
|
Issue #3659 - Enabled to display HFR-EAST_6KM or HFR-WEST_6KM data as a Time Series
Former-commit-id: ad4bae10c9 [formerly f7bcb81010 [formerly 2a03c64bb098a141c82aac4bab42d7d9f4a6296f]]
Former-commit-id: f7bcb81010
Former-commit-id: 05a7f534bf
|
2014-10-01 16:45:33 -04:00 |
|
Steve Harris
|
6900bb61c1
|
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: 3b6a8a1447 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]
Former-commit-id: 90e08b96e1
Former-commit-id: 3598e9b5b6
|
2014-09-29 12:58:56 -05:00 |
|
Ben Steffensmeier
|
a0d9cbede4
|
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: 5b10ac2f36 [formerly f92d021e96 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]]
Former-commit-id: f92d021e96
Former-commit-id: 6090625040
|
2014-09-29 10:49:14 -05:00 |
|
Steve Harris
|
db4aa1cebe
|
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: b979960b7b [formerly 7692e3f21d [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]
Former-commit-id: 7692e3f21d
Former-commit-id: 2e2072a963
|
2014-09-23 11:41:10 -05:00 |
|
Brian.Dyke
|
32d63dff6f
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 8d665b93b5 [formerly 4db67c581c [formerly 8d5d8cdfd272f8000a6a21a4128998889eb2ab30]]
Former-commit-id: 4db67c581c
Former-commit-id: 75f3bb31d5
|
2014-09-19 16:56:50 -04:00 |
|
Brian.Dyke
|
3791bd2cae
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 9c33ae6d2c [formerly 6ad8d500ef [formerly e895f7927a95c2416c05953e131d9e0c6095beb3]]
Former-commit-id: 6ad8d500ef
Former-commit-id: 9fc3eb20c1
|
2014-09-19 14:42:29 -04:00 |
|
Darrel Kingfield
|
48387a6bcf
|
VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872
Former-commit-id: 88a8dddef3 [formerly 1cabae50b1 [formerly a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a]]
Former-commit-id: 1cabae50b1
Former-commit-id: 3eeaa8f359
|
2014-09-19 11:14:09 -05:00 |
|
Steve Harris
|
e3a7796362
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
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/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: 4c56844e29 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]
Former-commit-id: 091555cf10
Former-commit-id: da530db540
|
2014-09-19 10:28:57 -05:00 |
|
Brian.Dyke
|
80f677e1e3
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 57a361073d [formerly e1c88f287a [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]]
Former-commit-id: e1c88f287a
Former-commit-id: 1c0d6624a3
|
2014-09-17 15:50:13 -04:00 |
|
Nate Jensen
|
85951c3aff
|
Omaha #3356 fix ingestGrib level factory initialization order
Change-Id: Iaad6d7aa9999f8387ed32806c655e5dee7e6a985
Former-commit-id: b89781c419 [formerly b516c4b8c8 [formerly 0ed8b10495a08f1f120cfb3ed4e99e011e3db5a2]]
Former-commit-id: b516c4b8c8
Former-commit-id: 877aab446c
|
2014-09-16 13:24:46 -05:00 |
|