AWIPS User
|
9ba75100cb
|
D2D menus
Former-commit-id: 2a6d837672
|
2015-04-22 17:05:35 -06:00 |
|
AWIPS User
|
ae10fa0d0d
|
menu:volume -> models
Former-commit-id: 39c005444f
|
2015-04-22 15:05:02 -06:00 |
|
mjames-upc
|
cd4cb8eb1d
|
Merge branch upc_14.4.1 into master_14.4.1
Former-commit-id: 2288995260
|
2015-04-22 15:11:19 -06:00 |
|
AWIPS User
|
5ad9c4e049
|
volume browser organization
Former-commit-id: bcaa201de4
|
2015-04-19 23:37:37 -06:00 |
|
AWIPS User
|
892c265b12
|
merge upc development orphan branch into upc_14.4.1
Former-commit-id: c9f28fd594
|
2015-03-01 12:44:45 -07:00 |
|
Joshua Watson
|
ba500bb277
|
VLab Issue #6496 - Key in sfcGrid.xml changed from HI-MOSGuide to MOSGuide-HI; fixes #6496
Change-Id: I4571bb639d474a86df39b7ea3bde1a23bad8f37f
Former-commit-id: 20dbdea326 [formerly 20dbdea326 [formerly aa05e8a312511e61c0dd01680b536282ee733154]]
Former-commit-id: a1a7877f92
Former-commit-id: 6af80563ef
|
2015-02-18 16:17:16 -05:00 |
|
Joshua Watson
|
4827934718
|
VLab Issue #6363 - Fixed malformed xml in GFSLAMPGridded.xml, changed ClgHgt to CigHgt in serverConfig.py and GFSLAMPGrid.py smart init; fixes #6363
Change-Id: Ibee986bdef73cdb6883fdd50e725d28d3838c848
Former-commit-id: 05c119663f [formerly 05c119663f [formerly 0017f74dfa8ce2c3dd386ea89547ec76f87bfdff]]
Former-commit-id: f6cf02c893
Former-commit-id: 5a136bb86b
|
2015-02-06 16:06:37 -05:00 |
|
Fay.Liang
|
37f830c123
|
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: ae85ade54d [formerly ae85ade54d [formerly 06a34c609a217ca98b027ac6d92a31faf802b668]]
Former-commit-id: f1c34884a5
Former-commit-id: 82b3637598
|
2015-02-03 11:24:57 -05:00 |
|
Ana Rivera
|
0715e923df
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: ea92049aac [formerly ea92049aac [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]
Former-commit-id: 070f0136ec
Former-commit-id: 1bbb9bad78
|
2015-01-30 19:29:29 +00:00 |
|
Ana Rivera
|
0af5d55eb6
|
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: 8bfa7c4087 [formerly 8bfa7c4087 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]]
Former-commit-id: 20ad0a65f3
Former-commit-id: 3696a3a1d1
|
2015-01-27 22:05:59 +00:00 |
|
Ana Rivera
|
ef4ca10b8a
|
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: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18
Former-commit-id: 7c5fc26537 [formerly 7c5fc26537 [formerly 889608360567b829f81ed6392c64c669798f34a9]]
Former-commit-id: 327945af8b
Former-commit-id: 5e97e24201
|
2015-01-27 16:28:42 +00:00 |
|
Ana Rivera
|
cd2841195b
|
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: 98ac97e397 [formerly 98ac97e397 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]]
Former-commit-id: 7c25945fd9
Former-commit-id: eae1bd317d
|
2015-01-26 18:45:26 +00:00 |
|
mjames-upc
|
ba80d4303b
|
modified code CAVE - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: e104fc35e2
|
2015-01-12 14:07:28 -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 |
|
Joshua Watson
|
eb68dac32d
|
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: 3f2f7f2f3a [formerly 3f2f7f2f3a [formerly 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29]]
Former-commit-id: 5aa4748569
Former-commit-id: 094e8048e9
|
2014-12-17 08:38:27 -05:00 |
|
Ana Rivera
|
f7c0319ee4
|
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: 043bc3a8b7 [formerly 043bc3a8b7 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]
Former-commit-id: 1823ed3596
Former-commit-id: d2d8127363
|
2014-12-16 23:39:02 +00:00 |
|
Evan Polster
|
e7ca46c58a
|
VLab Issue #5056. Ensemble Tool Feature; fixes #5056
Change-Id: I4333c27b7b10bf3fb5a78509a9f8cf752519083b
Former-commit-id: f5dd6a6d93 [formerly f5dd6a6d93 [formerly 546a3a1ec028f3ee72fa94c8525d4c92902319c3]]
Former-commit-id: 992cb6506f
Former-commit-id: e1cb0fc2da
|
2014-12-15 21:31:58 +00:00 |
|
Richard Peter
|
bf3ddbb62b
|
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: 2457d0e6f7 [formerly 2457d0e6f7 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]
Former-commit-id: 8de1ebcb65
Former-commit-id: f7d8755ba9
|
2014-12-12 10:36:04 -06:00 |
|
Joshua Watson
|
33e4b8bc88
|
VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840
Former-commit-id: a8f5bb480b [formerly a8f5bb480b [formerly cfce2a5f633a7312b9ad64dafb559c834b0ceddf]]
Former-commit-id: bca4b40eed
Former-commit-id: 9383635749
|
2014-12-11 11:39:00 -05:00 |
|
Nate Jensen
|
e53063661e
|
Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: ec28d2f1a0 [formerly ec28d2f1a0 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 291de3f039
|
2014-12-03 15:47:10 -06:00 |
|
Ana Rivera
|
ccbb684974
|
VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f
Former-commit-id: 709d571947 [formerly 709d571947 [formerly 6866439b0a7075f04146af4b4bdce59477269f4d]]
Former-commit-id: fe5bfbaa73
Former-commit-id: 8eaeb7b322
|
2014-12-02 15:44:07 +00:00 |
|
Ana Rivera
|
899a9d762d
|
VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
This reverts commit 227ca65a041b4cf1c6930926ce67b7f4394e1097 [formerly f1f5f2c717] [formerly c245f3a3c4 [formerly c245f3a3c4 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]].
Change-Id: I631bb1722abea96e08967a8d9fa9f175a886f685
Former-commit-id: 0e8473e91e [formerly 0e8473e91e [formerly 373acfce57d5e0044f13382b926cb2fc1f830e54]]
Former-commit-id: 5abf37ea62
Former-commit-id: 7c3dd12351
|
2014-12-02 13:43:03 +00:00 |
|
Roger Ferrel
|
975ee3aba9
|
Omaha #3866 Configuration files for GFS20KM for product and volume browsers.
Former-commit-id: 9b986c7cf8 [formerly 9b986c7cf8 [formerly 56833ab1b84e50c6ca4150d3c90501448233313b]]
Former-commit-id: 0df840602e
Former-commit-id: 4ba718da37
|
2014-11-25 10:01:30 -06:00 |
|
Ana Rivera
|
e5f6dae5bd
|
Merge branch 'master_14.4.1' into emc_14.4.1
Change-Id: I4984b06810f3484e919a4a4a5853435ca34167bb
Former-commit-id: 1645ccd9ca [formerly 1645ccd9ca [formerly c69e94f227cb908a9af2e1cd2db35b25bef28701]]
Former-commit-id: 1999049d90
Former-commit-id: 95b016ef4e
|
2014-11-21 14:23:49 +00:00 |
|
Roger Ferrel
|
77118778ae
|
Issue #3439 Changed id=gfs90 to id=gfs to avoid confusion in these xml files.
Change-Id: I55b44a25196e9dcbc0a5e1417da1c39e5b978f3e
Former-commit-id: 4d06812d30 [formerly 4d06812d30 [formerly a9ce685c99dbdc1442f022cda7af09af5bdabf87]]
Former-commit-id: 71db8afbaa
Former-commit-id: a188c5443b
|
2014-11-20 12:25:00 -06:00 |
|
Roger Ferrel
|
6e58de9ef0
|
Issue #3439 Replaced GFS213 with GFS229.
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15
Former-commit-id: 90a8b262f3 [formerly 90a8b262f3 [formerly 6cb88075375e3703b5ffe559ebd5e4f57d016880]]
Former-commit-id: b88300a5fc
Former-commit-id: 83c738abd9
|
2014-11-18 17:42:39 -06:00 |
|
Mark Peters
|
5d90bf9d76
|
Omaha #3300 Merge fixes for volume browser menus
Change-Id: Id2d6f643f80982d7b5c4f195e21775ec5def4b43
Former-commit-id: bcff3fc981 [formerly bcff3fc981 [formerly 1694a064c9496599532e9348a5eb89e558862e60]]
Former-commit-id: 666e8d4332
Former-commit-id: e08f52cc99
|
2014-11-18 16:03:42 -06:00 |
|
Roger Ferrel
|
8f06e69f21
|
Omaha #3727 Place HFR and HiResW entries in sub-menus.
Change-Id: I602cf35675c6ea4255ade4cb42ebe5c97207d62e
Former-commit-id: 28041de97e [formerly 28041de97e [formerly 0456cbbaf9c694a73c9862773b0e42165114b78d]]
Former-commit-id: 739b253792
Former-commit-id: 5f53024f75
|
2014-11-11 16:10:48 -06:00 |
|
Brian.Dyke
|
54f82d7f6f
|
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: aae68215c8 [formerly aae68215c8 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]
Former-commit-id: acf00264f4
Former-commit-id: 2b470ad1a1
|
2014-11-06 12:55:21 -05:00 |
|
Ana Rivera
|
ab680bc174
|
VLab Issue #5034 - Ingest and Display NWPS model data; fixes #5034
Change-Id: I836ffda083281073f5cf1d20de79f73091d49426
Former-commit-id: c245f3a3c4 [formerly c245f3a3c4 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]
Former-commit-id: f1f5f2c717
Former-commit-id: c76ed237ac
|
2014-10-22 17:03:07 +00:00 |
|
mjames-upc
|
7eeb299578
|
pull and merge for HRRR re-edits
Former-commit-id: 0116938d64
|
2014-10-09 16:14:37 -06:00 |
|
mjames-upc
|
a18fdadf38
|
HRRR menu additions for D2D and NCP
Former-commit-id: a6f311f847
|
2014-10-09 16:10:13 -06:00 |
|
Richard Peter
|
26ee8506f5
|
Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
Former-commit-id: e8bc97501b [formerly e8bc97501b [formerly 157588d388b9033424ddc46a22d74ccc302eea85]]
Former-commit-id: fa15d4ff21
Former-commit-id: d97655272f
|
2014-10-08 12:02:17 -05:00 |
|
mjames-upc
|
678cb6b929
|
HRRR resource added to D2D and NCP
Former-commit-id: b5232c09cb
|
2014-10-07 11:34:16 -06:00 |
|
Mark Peters
|
c2173b1925
|
Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e
Former-commit-id: 3464751716 [formerly 3464751716 [formerly 5f22815ea1ca5a1fbd010f642afe6a83778f6f58]]
Former-commit-id: 5ed537572a
Former-commit-id: c50ae98b5f
|
2014-10-07 11:42:44 -05:00 |
|
Roger Ferrel
|
7afe6d2df6
|
Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: dfbf07f377 [formerly dfbf07f377 [formerly be87967bf65bc07af5f89c13bf4cfd8eff9b4db6]]
Former-commit-id: d4ef865375
Former-commit-id: 96f484e323
|
2014-10-06 15:34:30 -05:00 |
|
Steve Harris
|
cfd49c8ca0
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 39c5e9c314 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]
Former-commit-id: 2db03d95b3
Former-commit-id: 3542caf090
|
2014-10-06 13:57:59 -05:00 |
|
Brian.Dyke
|
1d2dfd264a
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 65ad6056b6 [formerly 65ad6056b6 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]
Former-commit-id: f3f95aabb0
Former-commit-id: e77f1e126e
|
2014-10-02 10:38:51 -04:00 |
|
Slav Korolev
|
f05360e224
|
Issue #3659 - Enabled to display HFR-EAST_6KM or HFR-WEST_6KM data as a Time Series
Former-commit-id: f7bcb81010 [formerly f7bcb81010 [formerly 2a03c64bb098a141c82aac4bab42d7d9f4a6296f]]
Former-commit-id: ad4bae10c9
Former-commit-id: 8fddad1cd1
|
2014-10-01 16:45:33 -04:00 |
|
dmsys
|
e00ea2d8cd
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 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/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 8c3625cfec [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]
Former-commit-id: 9f4560c480
Former-commit-id: b884e5e32d
|
2014-09-30 13:45:54 -04:00 |
|
Steve Harris
|
30f0d27dfb
|
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: 90e08b96e1 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]
Former-commit-id: 3b6a8a1447
Former-commit-id: 6330a62e85
|
2014-09-29 12:58:56 -05:00 |
|
Brian.Dyke
|
4359e8dc47
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 1ac61fb612 [formerly 1ac61fb612 [formerly 5b570e5229628de88068edee1c70c26eec13f71a]]
Former-commit-id: f26fe97ec4
Former-commit-id: 33525968e3
|
2014-09-26 14:19:03 -04:00 |
|
Ana Rivera
|
97ae16163f
|
VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8
Former-commit-id: d96f5fe229 [formerly d96f5fe229 [formerly 833cff4f37542078578de96b3b59723f77c31f4c]]
Former-commit-id: a72725f9ef
Former-commit-id: dd45d98a0e
|
2014-09-25 17:46:53 +00:00 |
|
Brian.Dyke
|
8997f79ae4
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
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
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
Former-commit-id: 4b418918d4 [formerly 4b418918d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]
Former-commit-id: 87fa32d2d4
Former-commit-id: 1f09dad9e9
|
2014-09-24 11:05:37 -04:00 |
|
Steve Harris
|
f831536854
|
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: 7692e3f21d [formerly 7692e3f21d [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]
Former-commit-id: b979960b7b
Former-commit-id: 50d6dccd09
|
2014-09-23 11:41:10 -05:00 |
|
Brian.Dyke
|
ebbb7003d9
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 88d5f872ae [formerly 88d5f872ae [formerly aaae61509d743553186cdefdea0557158b139527]]
Former-commit-id: 9435507b27
Former-commit-id: 1b8af8379f
|
2014-09-19 13:14:13 -04:00 |
|
Mark Peters
|
08a3acb2d4
|
Omaha #3300 Merge fixes for 14.4.1
Change-Id: I9a7e4131bfbd6503e70001594b93492c7cbad5fd
Former-commit-id: 048e8339fd [formerly 048e8339fd [formerly 1ecf38ee8614f3df751fe9debbdfdb2771e5bea1]]
Former-commit-id: 26e4f86248
Former-commit-id: c49df63363
|
2014-09-19 12:01:07 -05:00 |
|
Darrel Kingfield
|
142edfe588
|
VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872
Former-commit-id: 1cabae50b1 [formerly 1cabae50b1 [formerly a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a]]
Former-commit-id: 88a8dddef3
Former-commit-id: 00a056c154
|
2014-09-19 11:14:09 -05:00 |
|
Steve Harris
|
fdc523a026
|
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: 091555cf10 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]
Former-commit-id: 4c56844e29
Former-commit-id: 214b48dcb8
|
2014-09-19 10:28:57 -05:00 |
|
Ana Rivera
|
c12eb3b106
|
VLab Issue #4794 - RM 16720 Update LevelMappingFile.xml; fixes #4794
Change-Id: I58d0cb7e38d5ed483db5c87cc322c93764e21f06
Former-commit-id: 9d8c08a09a [formerly 9d8c08a09a [formerly 3af534fb2778268fee650c09c5aa0346df746ce8]]
Former-commit-id: 56f409717f
Former-commit-id: 030d8c45b7
|
2014-09-19 15:17:46 +00:00 |
|