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 |
|
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 |
|
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 |
|
Richard Peter
|
7434f3c20e
|
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: 20fa07c6d3 [formerly 23eafaba3d ] [formerly 2457d0e6f7 ] [formerly 20fa07c6d3 [formerly 23eafaba3d ] [formerly 2457d0e6f7 ] [formerly 8de1ebcb65 [formerly 2457d0e6f7 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]]]
Former-commit-id: 8de1ebcb65
Former-commit-id: 9c162858f4 [formerly 746bbb0885 ] [formerly 2a8f875c3a3a12752593d61bb77d88a0341b5368 [formerly f7d8755ba9 ]]
Former-commit-id: 0fc5096e00ed840082ba093d3d160ad0e811a828 [formerly bf3ddbb62b ]
Former-commit-id: 59e9fe78f2
|
2014-12-12 10:36:04 -06:00 |
|
Nate Jensen
|
ad2a20dd43
|
Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: effb6c68bf [formerly 6c1391e938 ] [formerly ec28d2f1a0 ] [formerly effb6c68bf [formerly 6c1391e938 ] [formerly ec28d2f1a0 ] [formerly 8dbe6abbe4 [formerly ec28d2f1a0 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 3202b579c1 [formerly 1c5057a13f ] [formerly fe8f15a6cf651b03c628440d9b584168f73a916a [formerly 291de3f039 ]]
Former-commit-id: 62ac51e4fd5ddf96d1a40756fde9b064052645f9 [formerly e53063661e ]
Former-commit-id: 0bb18f02d0
|
2014-12-03 15:47:10 -06:00 |
|
Ana Rivera
|
eab9db361b
|
VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f
Former-commit-id: 00c85ffff1 [formerly edfb394f22 ] [formerly 709d571947 ] [formerly 00c85ffff1 [formerly edfb394f22 ] [formerly 709d571947 ] [formerly fe5bfbaa73 [formerly 709d571947 [formerly 6866439b0a7075f04146af4b4bdce59477269f4d]]]]
Former-commit-id: fe5bfbaa73
Former-commit-id: a05c22dc1f [formerly 985e612d6d ] [formerly 6335ac2da6f01e7c94cfb1f3c9913dbbaa115670 [formerly 8eaeb7b322 ]]
Former-commit-id: 708495604df18e3434e02b0ac41902b4d38d9d43 [formerly ccbb684974 ]
Former-commit-id: a9619b5bca
|
2014-12-02 15:44:07 +00:00 |
|
Ana Rivera
|
f258b9506d
|
VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
This reverts commit 227ca65a041b4cf1c6930926ce67b7f4394e1097 [formerly f1f5f2c717 ] [formerly 3e6ab19015 [formerly 53b96c2b8e ] [formerly c245f3a3c4 ] [formerly 3e6ab19015 [formerly 53b96c2b8e ] [formerly c245f3a3c4 ] [formerly f1f5f2c717 [formerly c245f3a3c4 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]]]].
Change-Id: I631bb1722abea96e08967a8d9fa9f175a886f685
Former-commit-id: 8e7de741ae [formerly eb0253f820 ] [formerly 0e8473e91e ] [formerly 8e7de741ae [formerly eb0253f820 ] [formerly 0e8473e91e ] [formerly 5abf37ea62 [formerly 0e8473e91e [formerly 373acfce57d5e0044f13382b926cb2fc1f830e54]]]]
Former-commit-id: 5abf37ea62
Former-commit-id: 9c599b4e33 [formerly 79b19d6368 ] [formerly 1922a2d65cec4bad318dc94f9c65fef2f5c44ff0 [formerly 7c3dd12351 ]]
Former-commit-id: 3ed1ea20b530fdf4008ae323ec61b05a69892c33 [formerly 899a9d762d ]
Former-commit-id: d2a979a0e5
|
2014-12-02 13:43:03 +00:00 |
|
Roger Ferrel
|
a59bc37da3
|
Omaha #3866 Configuration files for GFS20KM for product and volume browsers.
Former-commit-id: cebf9ec3fd [formerly da25f4588d ] [formerly 9b986c7cf8 ] [formerly cebf9ec3fd [formerly da25f4588d ] [formerly 9b986c7cf8 ] [formerly 0df840602e [formerly 9b986c7cf8 [formerly 56833ab1b84e50c6ca4150d3c90501448233313b]]]]
Former-commit-id: 0df840602e
Former-commit-id: 1c8a3553c8 [formerly 2d763dc64a ] [formerly ff2dd0ef5603073e1ca3c76f69aa1b28f64aff23 [formerly 4ba718da37 ]]
Former-commit-id: 5eb1fcdf5e89182bc2a067ff665cf4fdb2b08fad [formerly 975ee3aba9 ]
Former-commit-id: c79c325df6
|
2014-11-25 10:01:30 -06:00 |
|
Ana Rivera
|
1f3cb6c03c
|
Merge branch 'master_14.4.1' into emc_14.4.1
Change-Id: I4984b06810f3484e919a4a4a5853435ca34167bb
Former-commit-id: d503800c3e [formerly 02e630bc93 ] [formerly 1645ccd9ca ] [formerly d503800c3e [formerly 02e630bc93 ] [formerly 1645ccd9ca ] [formerly 1999049d90 [formerly 1645ccd9ca [formerly c69e94f227cb908a9af2e1cd2db35b25bef28701]]]]
Former-commit-id: 1999049d90
Former-commit-id: 5c2b40a714 [formerly 0fcfcbc05b ] [formerly f71506bd83d6852ff966d4dcea407d444911b438 [formerly 95b016ef4e ]]
Former-commit-id: c4a48ce22086598863ce207d78fa63f3a8c0ea56 [formerly e5f6dae5bd ]
Former-commit-id: eb1f2809b0
|
2014-11-21 14:23:49 +00:00 |
|
Roger Ferrel
|
7eed1054cc
|
Issue #3439 Changed id=gfs90 to id=gfs to avoid confusion in these xml files.
Change-Id: I55b44a25196e9dcbc0a5e1417da1c39e5b978f3e
Former-commit-id: 58019036d5 [formerly 4bcfb3ccaf ] [formerly 4d06812d30 ] [formerly 58019036d5 [formerly 4bcfb3ccaf ] [formerly 4d06812d30 ] [formerly 71db8afbaa [formerly 4d06812d30 [formerly a9ce685c99dbdc1442f022cda7af09af5bdabf87]]]]
Former-commit-id: 71db8afbaa
Former-commit-id: 65676609b4 [formerly 1a39fc8b9c ] [formerly dafbbfa4ef0200bacdb899a8cf93fe9efc90d3c8 [formerly a188c5443b ]]
Former-commit-id: b3e43b6216b763fd3506be07b141a941138e0c13 [formerly 77118778ae ]
Former-commit-id: d310b78363
|
2014-11-20 12:25:00 -06:00 |
|
Roger Ferrel
|
b9cfeede1c
|
Issue #3439 Replaced GFS213 with GFS229.
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15
Former-commit-id: 18d467a6c7 [formerly 85d717b49c ] [formerly 90a8b262f3 ] [formerly 18d467a6c7 [formerly 85d717b49c ] [formerly 90a8b262f3 ] [formerly b88300a5fc [formerly 90a8b262f3 [formerly 6cb88075375e3703b5ffe559ebd5e4f57d016880]]]]
Former-commit-id: b88300a5fc
Former-commit-id: 7c6a09b6da [formerly b86d906a5a ] [formerly 9574acdebff523891e8e57b567844ffb96eb1ad1 [formerly 83c738abd9 ]]
Former-commit-id: 3bc156fe1002cdc3db57c9146ae2e504cf3e0b4c [formerly 6e58de9ef0 ]
Former-commit-id: 4006dd2e2b
|
2014-11-18 17:42:39 -06:00 |
|
Mark Peters
|
e5f3444519
|
Omaha #3300 Merge fixes for volume browser menus
Change-Id: Id2d6f643f80982d7b5c4f195e21775ec5def4b43
Former-commit-id: 8b2077013e [formerly b98bcbdb35 ] [formerly bcff3fc981 ] [formerly 8b2077013e [formerly b98bcbdb35 ] [formerly bcff3fc981 ] [formerly 666e8d4332 [formerly bcff3fc981 [formerly 1694a064c9496599532e9348a5eb89e558862e60]]]]
Former-commit-id: 666e8d4332
Former-commit-id: c357c2c286 [formerly 5ee156873c ] [formerly ef1b7007ceed272ed9fd8913d9d212dc4413bc32 [formerly e08f52cc99 ]]
Former-commit-id: 9fa2f2630e4686e0232d75351abc49a63b488cbe [formerly 5d90bf9d76 ]
Former-commit-id: 45edaf0ac1
|
2014-11-18 16:03:42 -06:00 |
|
Roger Ferrel
|
e9bd1c4469
|
Omaha #3727 Place HFR and HiResW entries in sub-menus.
Change-Id: I602cf35675c6ea4255ade4cb42ebe5c97207d62e
Former-commit-id: d699b7f6c3 [formerly 6494c71a41 ] [formerly 28041de97e ] [formerly d699b7f6c3 [formerly 6494c71a41 ] [formerly 28041de97e ] [formerly 739b253792 [formerly 28041de97e [formerly 0456cbbaf9c694a73c9862773b0e42165114b78d]]]]
Former-commit-id: 739b253792
Former-commit-id: 3e647efde4 [formerly 81fde984dc ] [formerly ddb11c190da2ab281699238dae06184adbe10e68 [formerly 5f53024f75 ]]
Former-commit-id: 4d77f4599be494d5987d1cf91af800646f5bb207 [formerly 8f06e69f21 ]
Former-commit-id: 6322e45910
|
2014-11-11 16:10:48 -06:00 |
|
Brian.Dyke
|
7110577c6d
|
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: 5cdd9f4256 [formerly 4ac24af0a9 ] [formerly aae68215c8 ] [formerly 5cdd9f4256 [formerly 4ac24af0a9 ] [formerly aae68215c8 ] [formerly acf00264f4 [formerly aae68215c8 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]]]
Former-commit-id: acf00264f4
Former-commit-id: 2e2d7c8172 [formerly 2743718323 ] [formerly d0f054998cbe947b901e2eae4a437cb153a73dde [formerly 2b470ad1a1 ]]
Former-commit-id: 4be36e5bccda05c1cb9a4bc60ef64c8efe6da078 [formerly 54f82d7f6f ]
Former-commit-id: f25f4ecb2c
|
2014-11-06 12:55:21 -05:00 |
|
Ana Rivera
|
d8be6f9a26
|
VLab Issue #5034 - Ingest and Display NWPS model data; fixes #5034
Change-Id: I836ffda083281073f5cf1d20de79f73091d49426
Former-commit-id: 3e6ab19015 [formerly 53b96c2b8e ] [formerly c245f3a3c4 ] [formerly 3e6ab19015 [formerly 53b96c2b8e ] [formerly c245f3a3c4 ] [formerly f1f5f2c717 [formerly c245f3a3c4 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]]]
Former-commit-id: f1f5f2c717
Former-commit-id: b6fae9cb4c [formerly 7c67376e2c ] [formerly f210e880062462da12f4debe27a874ab82df0927 [formerly c76ed237ac ]]
Former-commit-id: 89856c5937cee80f8b1452ea7453f0003447a89e [formerly ab680bc174 ]
Former-commit-id: 8dcce407dd
|
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
|
d215cc7fcb
|
Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
Former-commit-id: a4fd6b8a09 [formerly 04bf8666b3 ] [formerly e8bc97501b ] [formerly a4fd6b8a09 [formerly 04bf8666b3 ] [formerly e8bc97501b ] [formerly fa15d4ff21 [formerly e8bc97501b [formerly 157588d388b9033424ddc46a22d74ccc302eea85]]]]
Former-commit-id: fa15d4ff21
Former-commit-id: 422a457e9e [formerly baabb4a12f ] [formerly 7a305bc6129c81c773d00eed85f56a1759d93cfa [formerly d97655272f ]]
Former-commit-id: 867a14e53bc275209f6bf4d3d19485de51ca196e [formerly 26ee8506f5 ]
Former-commit-id: e5b9aa8b3f
|
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
|
ba47bfd846
|
Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e
Former-commit-id: 41a0fa9bfe [formerly dc27d9252c ] [formerly 3464751716 ] [formerly 41a0fa9bfe [formerly dc27d9252c ] [formerly 3464751716 ] [formerly 5ed537572a [formerly 3464751716 [formerly 5f22815ea1ca5a1fbd010f642afe6a83778f6f58]]]]
Former-commit-id: 5ed537572a
Former-commit-id: e66adcd8ff [formerly 82e2a2bbb5 ] [formerly e8adb61acc7a249cc87878a153cb4b17d34bf566 [formerly c50ae98b5f ]]
Former-commit-id: eab6b7d95d209e071ff8f9cbfcee197abb9ff1a3 [formerly c2173b1925 ]
Former-commit-id: dffbaa684d
|
2014-10-07 11:42:44 -05:00 |
|
Roger Ferrel
|
1eb7f14c99
|
Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: 50982e8160 [formerly 2f8d5263b9 ] [formerly dfbf07f377 ] [formerly 50982e8160 [formerly 2f8d5263b9 ] [formerly dfbf07f377 ] [formerly d4ef865375 [formerly dfbf07f377 [formerly be87967bf65bc07af5f89c13bf4cfd8eff9b4db6]]]]
Former-commit-id: d4ef865375
Former-commit-id: ecec042861 [formerly 05c00c7bc7 ] [formerly cb42eace946af5e6c4a04a8e522489b3f209954f [formerly 96f484e323 ]]
Former-commit-id: 9ad6c12354950dd916b1af65b9e0a613b027237b [formerly 7afe6d2df6 ]
Former-commit-id: 861da21f34
|
2014-10-06 15:34:30 -05:00 |
|
Steve Harris
|
cf73096716
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 53dc9657e2 [formerly 06a27b2d3c ] [formerly 39c5e9c314 ] [formerly 53dc9657e2 [formerly 06a27b2d3c ] [formerly 39c5e9c314 ] [formerly 2db03d95b3 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]]]
Former-commit-id: 2db03d95b3
Former-commit-id: ca63a8cfc3 [formerly bcf1265a16 ] [formerly 4363db305e76ae3a50e019f510a7b919ebc7230e [formerly 3542caf090 ]]
Former-commit-id: 0522d4db8f9331e9bfd83cc7147290634159c673 [formerly cfd49c8ca0 ]
Former-commit-id: afd3d3fa2d
|
2014-10-06 13:57:59 -05:00 |
|
Brian.Dyke
|
2b3ced91f5
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 06f6dfc38a [formerly 006bdb00ad ] [formerly 65ad6056b6 ] [formerly 06f6dfc38a [formerly 006bdb00ad ] [formerly 65ad6056b6 ] [formerly f3f95aabb0 [formerly 65ad6056b6 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]]]
Former-commit-id: f3f95aabb0
Former-commit-id: 452a3f046b [formerly d174db3b0c ] [formerly c24910662181554debcd898acc9cf5ec28027cf0 [formerly e77f1e126e ]]
Former-commit-id: 2c9750edd9ade43fd7db7e61b4503a53d6f26781 [formerly 1d2dfd264a ]
Former-commit-id: e100894074
|
2014-10-02 10:38:51 -04:00 |
|
Slav Korolev
|
2d70976ee4
|
Issue #3659 - Enabled to display HFR-EAST_6KM or HFR-WEST_6KM data as a Time Series
Former-commit-id: 5aa180c0cc [formerly 05a7f534bf ] [formerly f7bcb81010 ] [formerly 5aa180c0cc [formerly 05a7f534bf ] [formerly f7bcb81010 ] [formerly ad4bae10c9 [formerly f7bcb81010 [formerly 2a03c64bb098a141c82aac4bab42d7d9f4a6296f]]]]
Former-commit-id: ad4bae10c9
Former-commit-id: 784a84a7d1 [formerly c00a8eb707 ] [formerly 4099421dd0042e01b8c5c609db7d9dffd96bd658 [formerly 8fddad1cd1 ]]
Former-commit-id: 65475f547b72b48ca21bd14c428e97976b3a3c10 [formerly f05360e224 ]
Former-commit-id: 55c7492692
|
2014-10-01 16:45:33 -04:00 |
|
dmsys
|
6b2eccce36
|
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: 70cb8d81b0 [formerly f704781f4f ] [formerly 8c3625cfec ] [formerly 70cb8d81b0 [formerly f704781f4f ] [formerly 8c3625cfec ] [formerly 9f4560c480 [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]]
Former-commit-id: 9f4560c480
Former-commit-id: 0cb584f44e [formerly 07f84c6b26 ] [formerly 674f011faa89a8d6263043b42cfc79d80e3b82b4 [formerly b884e5e32d ]]
Former-commit-id: 8f7a656cd223aa4bbbad7217939da98d6e8672ab [formerly e00ea2d8cd ]
Former-commit-id: 71d6e48473
|
2014-09-30 13:45:54 -04:00 |
|
Steve Harris
|
10752cbc42
|
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: 6900bb61c1 [formerly 3598e9b5b6 ] [formerly 90e08b96e1 ] [formerly 6900bb61c1 [formerly 3598e9b5b6 ] [formerly 90e08b96e1 ] [formerly 3b6a8a1447 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]]
Former-commit-id: 3b6a8a1447
Former-commit-id: e9774e46ea [formerly 842abaad49 ] [formerly 1f609e71c1d55fbd64663d85caf8d8fbf61ab92c [formerly 6330a62e85 ]]
Former-commit-id: df06a15df0e12cfd77916f5f59e1b95c241b34d2 [formerly 30f0d27dfb ]
Former-commit-id: 4c4380580f
|
2014-09-29 12:58:56 -05:00 |
|
Brian.Dyke
|
d81096c5ca
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 698273b551 [formerly 396f9755dc ] [formerly 1ac61fb612 ] [formerly 698273b551 [formerly 396f9755dc ] [formerly 1ac61fb612 ] [formerly f26fe97ec4 [formerly 1ac61fb612 [formerly 5b570e5229628de88068edee1c70c26eec13f71a]]]]
Former-commit-id: f26fe97ec4
Former-commit-id: 19bd990683 [formerly f6af0dd0df ] [formerly 2c9cf5cc04ae60ed33371ee6fa605e762929a4a0 [formerly 33525968e3 ]]
Former-commit-id: 2fb1e2bc67ea5f2cb68c1b79a31dc29d8cfb3cb8 [formerly 4359e8dc47 ]
Former-commit-id: b481c3f064
|
2014-09-26 14:19:03 -04:00 |
|
Ana Rivera
|
c64deae465
|
VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8
Former-commit-id: 11fbbb65be [formerly e55855b4ff ] [formerly d96f5fe229 ] [formerly 11fbbb65be [formerly e55855b4ff ] [formerly d96f5fe229 ] [formerly a72725f9ef [formerly d96f5fe229 [formerly 833cff4f37542078578de96b3b59723f77c31f4c]]]]
Former-commit-id: a72725f9ef
Former-commit-id: 3ce2d592ea [formerly 1b94e7fdb2 ] [formerly 8f0e345142e3f88b585dcd2c3828b7bdbd6bd4d2 [formerly dd45d98a0e ]]
Former-commit-id: cded20de1b1d1953e821ffc9e88052564abb75d7 [formerly 97ae16163f ]
Former-commit-id: ab3de760b0
|
2014-09-25 17:46:53 +00:00 |
|
Brian.Dyke
|
b8b9d3105b
|
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: 6dafb062e9 [formerly b49b13f77e ] [formerly 4b418918d4 ] [formerly 6dafb062e9 [formerly b49b13f77e ] [formerly 4b418918d4 ] [formerly 87fa32d2d4 [formerly 4b418918d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]]]
Former-commit-id: 87fa32d2d4
Former-commit-id: e16e6e5a2a [formerly cf8f88a5b3 ] [formerly cd9613c4078591bf28ad1064690bfbbbf551cbaa [formerly 1f09dad9e9 ]]
Former-commit-id: c0bfed574e2fa14299c865bac77af847704ef3c7 [formerly 8997f79ae4 ]
Former-commit-id: c22973f909
|
2014-09-24 11:05:37 -04:00 |
|
Steve Harris
|
07c7b38a12
|
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: db4aa1cebe [formerly 2e2072a963 ] [formerly 7692e3f21d ] [formerly db4aa1cebe [formerly 2e2072a963 ] [formerly 7692e3f21d ] [formerly b979960b7b [formerly 7692e3f21d [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]]]
Former-commit-id: b979960b7b
Former-commit-id: 4c7af33eee [formerly e5f8a8f74f ] [formerly bb2bf4306deda494aadd9b7efdffeebf393b4e15 [formerly 50d6dccd09 ]]
Former-commit-id: 0542ccaca6c476485c13ff1fd290c8c34213e7a0 [formerly f831536854 ]
Former-commit-id: d3169a96b0
|
2014-09-23 11:41:10 -05:00 |
|
Brian.Dyke
|
c057bba4ca
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 0ae72bd3d3 [formerly 813d2be68e ] [formerly 88d5f872ae ] [formerly 0ae72bd3d3 [formerly 813d2be68e ] [formerly 88d5f872ae ] [formerly 9435507b27 [formerly 88d5f872ae [formerly aaae61509d743553186cdefdea0557158b139527]]]]
Former-commit-id: 9435507b27
Former-commit-id: 980783df22 [formerly c94cc5fe38 ] [formerly 4e839ccfa8ae121ec2d5ed3024bb210a57c147c4 [formerly 1b8af8379f ]]
Former-commit-id: d7644d57fd9c207a751459519eb4150674be72d5 [formerly ebbb7003d9 ]
Former-commit-id: caa450388a
|
2014-09-19 13:14:13 -04:00 |
|
Mark Peters
|
9a79a99c9c
|
Omaha #3300 Merge fixes for 14.4.1
Change-Id: I9a7e4131bfbd6503e70001594b93492c7cbad5fd
Former-commit-id: e50c04fa7e [formerly e99d90307b ] [formerly 048e8339fd ] [formerly e50c04fa7e [formerly e99d90307b ] [formerly 048e8339fd ] [formerly 26e4f86248 [formerly 048e8339fd [formerly 1ecf38ee8614f3df751fe9debbdfdb2771e5bea1]]]]
Former-commit-id: 26e4f86248
Former-commit-id: 3ee2040ac5 [formerly 16961860a8 ] [formerly 2e7d5383f31c3fc91ba8aeac92800d4fa2640c06 [formerly c49df63363 ]]
Former-commit-id: 4387f6222b3b4a139a9e0ad105a79daf051019d9 [formerly 08a3acb2d4 ]
Former-commit-id: 494a7bc745
|
2014-09-19 12:01:07 -05:00 |
|
Darrel Kingfield
|
bb517865e2
|
VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872
Former-commit-id: 48387a6bcf [formerly 3eeaa8f359 ] [formerly 1cabae50b1 ] [formerly 48387a6bcf [formerly 3eeaa8f359 ] [formerly 1cabae50b1 ] [formerly 88a8dddef3 [formerly 1cabae50b1 [formerly a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a]]]]
Former-commit-id: 88a8dddef3
Former-commit-id: 3fc3c878ce [formerly b5e546503c ] [formerly 84f67f72b73c8e8a6bab68a5c1c18d696b14b730 [formerly 00a056c154 ]]
Former-commit-id: be0abf007625df1407024754c3cb657219086d15 [formerly 142edfe588 ]
Former-commit-id: 11fd795d32
|
2014-09-19 11:14:09 -05:00 |
|
Steve Harris
|
b316e73f24
|
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: e3a7796362 [formerly da530db540 ] [formerly 091555cf10 ] [formerly e3a7796362 [formerly da530db540 ] [formerly 091555cf10 ] [formerly 4c56844e29 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]]
Former-commit-id: 4c56844e29
Former-commit-id: a1bf8ecdb1 [formerly 84a98ec4ca ] [formerly 275a024694cc566f868a949d844ab91490e424f6 [formerly 214b48dcb8 ]]
Former-commit-id: 9adb015794435a13e656ce09cd891bfd9e4d53db [formerly fdc523a026 ]
Former-commit-id: f4ea796cea
|
2014-09-19 10:28:57 -05:00 |
|
Ana Rivera
|
a093261309
|
VLab Issue #4794 - RM 16720 Update LevelMappingFile.xml; fixes #4794
Change-Id: I58d0cb7e38d5ed483db5c87cc322c93764e21f06
Former-commit-id: 812cccb32f [formerly 2a25376398 ] [formerly 9d8c08a09a ] [formerly 812cccb32f [formerly 2a25376398 ] [formerly 9d8c08a09a ] [formerly 56f409717f [formerly 9d8c08a09a [formerly 3af534fb2778268fee650c09c5aa0346df746ce8]]]]
Former-commit-id: 56f409717f
Former-commit-id: 0d22a83eb7 [formerly 9bc42712de ] [formerly 5fa715a0b380b4d955c4a393daac5a80999d92fa [formerly 030d8c45b7 ]]
Former-commit-id: 1d247bdcbcce5a659732a169d2f30f0fb41c8ad7 [formerly c12eb3b106 ]
Former-commit-id: 2302527f91
|
2014-09-19 15:17:46 +00:00 |
|
Brian.Dyke
|
845a9cb390
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 80f677e1e3 [formerly 1c0d6624a3 ] [formerly e1c88f287a ] [formerly 80f677e1e3 [formerly 1c0d6624a3 ] [formerly e1c88f287a ] [formerly 57a361073d [formerly e1c88f287a [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]]]]
Former-commit-id: 57a361073d
Former-commit-id: bf6931a113 [formerly 47feda6450 ] [formerly 56e8b90c211d77cd58bb224d0ec60bd67aba968d [formerly 4476b9d19e ]]
Former-commit-id: ef186b2221b07e34cc32e9dc0106aff32d72736c [formerly 7e53a1d558 ]
Former-commit-id: c95be437eb
|
2014-09-17 15:50:13 -04:00 |
|
Brian.Dyke
|
e28f5790ef
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 4bd6272b20 [formerly 45e7435494 ] [formerly 21fedc3565 ] [formerly 4bd6272b20 [formerly 45e7435494 ] [formerly 21fedc3565 ] [formerly 83099ee81f [formerly 21fedc3565 [formerly ab9b7ec5424512656d2fb343773fa97658c04ecd]]]]
Former-commit-id: 83099ee81f
Former-commit-id: 556e84df57 [formerly d56c30fb40 ] [formerly 22f9de9d79cccf508057871bd98c315a8593e5ef [formerly 997a7f528f ]]
Former-commit-id: da77978f9779b14bdb290eae469b6980c43204f6 [formerly e97f5bc086 ]
Former-commit-id: ccf0104c8b
|
2014-09-12 14:11:57 -04:00 |
|
Ana Rivera
|
739724b1fe
|
VLab Issue #4671 - Remove duplicate entries from fieldsMenus.xml, updates SMS RM 16720 (HRRR); fixes #4671
Change-Id: I9708b606e5a7d2c2fc9355d765fbad9113a40493
Former-commit-id: 853ac240da [formerly b83fd7501f ] [formerly 09152bc49b ] [formerly 853ac240da [formerly b83fd7501f ] [formerly 09152bc49b ] [formerly 909f4d8632 [formerly 09152bc49b [formerly 94e5089beb782011d107de4aeeb8b35694f2f5c3]]]]
Former-commit-id: 909f4d8632
Former-commit-id: 6e419227bc [formerly df869efb23 ] [formerly bfd7b0b08bf7548fbc9a4e28cf62211d340558da [formerly 84538be9a1 ]]
Former-commit-id: 39b02618ce72823923ae05b58eb78269195b4991 [formerly 29f8ade06b ]
Former-commit-id: 3a09bf0228
|
2014-09-11 21:17:43 +00:00 |
|
mjames-upc
|
25eb7e0b69
|
LDM updates: data_store file/path names changed to avoid unintended subdirs in grib2 tree.
Former-commit-id: 8d2853c57c
|
2014-09-10 15:07:18 -06:00 |
|
Nate Jensen
|
5bf7a632ad
|
Omaha #3356 updates for improved level lookup
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362
Former-commit-id: 1e06c862bf [formerly 1c77f66608 ] [formerly ae9cffaaea ] [formerly 1e06c862bf [formerly 1c77f66608 ] [formerly ae9cffaaea ] [formerly 62b84b2fb3 [formerly ae9cffaaea [formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]]]]
Former-commit-id: 62b84b2fb3
Former-commit-id: 925288784b [formerly d397d4147c ] [formerly 87f7aeab8ea0381f4b60524400099467d56eef15 [formerly f5ae895143 ]]
Former-commit-id: 14cf3a3aaa85b3c7504b40d5dab981a05190edd4 [formerly eec3df9cd5 ]
Former-commit-id: 3cf27fb414
|
2014-09-09 15:38:53 -05:00 |
|
Brian.Dyke
|
74f3dd287f
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: d8271549ff [formerly fe85eb9f70 ] [formerly 3d9a3de6e4 ] [formerly d8271549ff [formerly fe85eb9f70 ] [formerly 3d9a3de6e4 ] [formerly 01dfe503f5 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]]
Former-commit-id: 01dfe503f5
Former-commit-id: 3319853886 [formerly 29364e2b9f ] [formerly 3c59646613e08582e0a259ecdec538060ca047c5 [formerly c42733eb39 ]]
Former-commit-id: 582e8cd843a57e8f4ac7a6572a5b3e23cd3b4f25 [formerly a31d3d702e ]
Former-commit-id: 0f9fe8301a
|
2014-09-09 11:44:30 -04:00 |
|
Brian.Dyke
|
0c715b7439
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: a344be95c8 [formerly 5415a4939a ] [formerly 858b91d677 ] [formerly a344be95c8 [formerly 5415a4939a ] [formerly 858b91d677 ] [formerly af477df90e [formerly 858b91d677 [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]]]]
Former-commit-id: af477df90e
Former-commit-id: 4582533601 [formerly dde3efc567 ] [formerly f892d9608dc1fb65163dac3714b16398a7d89022 [formerly 6c4b121752 ]]
Former-commit-id: 2c8a415a8d01954bd8f0e11fa551974a70c7759e [formerly 66c4758f2d ]
Former-commit-id: b42aba7839
|
2014-09-08 14:54:16 -04:00 |
|
Baoyu Yin
|
7e309ab67f
|
VLab Issue #4623 - AWIPS2_DR_17363 LAPS freezing level height not computed prevents display of hail product; fixes #4623
Change-Id: I3b608e9024dbe70e08a549b5469c2fb09e448a9a
Former-commit-id: 281598d5d0 [formerly db7c16b305 ] [formerly 3e39cd9bb5 ] [formerly 281598d5d0 [formerly db7c16b305 ] [formerly 3e39cd9bb5 ] [formerly 7008216976 [formerly 3e39cd9bb5 [formerly 61838d538f73adb6279ba55d5fe3c5b02d3a28f4]]]]
Former-commit-id: 7008216976
Former-commit-id: f78521c532 [formerly aaffd08d53 ] [formerly 452b82a2238e720fa0b0203b8774116080b81ee2 [formerly 340e242ee8 ]]
Former-commit-id: 7215bf48eb20f0a35e2d88482211888b83e150d6 [formerly b1d682a92e ]
Former-commit-id: 7ee5c5a36c
|
2014-09-05 11:18:54 -04:00 |
|
Baoyu Yin
|
26f4bd04aa
|
VLab Issue #4608 - AWIPS2_DR_16259 Minor Typo in Volume Menu of D2D 4-PanelFamilies ; fixes #4608
Change-Id: I73a3f5a441e33dffe3dc7f3962c3fceec930ce3a
Former-commit-id: aceb692669 [formerly 5ad996e60e ] [formerly 9e110936e8 ] [formerly aceb692669 [formerly 5ad996e60e ] [formerly 9e110936e8 ] [formerly 73f7935f46 [formerly 9e110936e8 [formerly cb4e2e652ba3763725b8ec7e6d528748d2472a6b]]]]
Former-commit-id: 73f7935f46
Former-commit-id: cec7bad844 [formerly 83de62e506 ] [formerly 08092bf5876e0c0b56e12a04b44ff0b43c21ecf5 [formerly 17268bb5dd ]]
Former-commit-id: 07fa330aad6758c7fa29e8c5c776b8c54e5e0a87 [formerly 8a9ec04c80 ]
Former-commit-id: 6a427f968c
|
2014-09-04 08:23:53 -04:00 |
|
Brian.Dyke
|
3539b14e3b
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 9105ef9aa2 [formerly e425e5bf8c ] [formerly f0875e724f ] [formerly 9105ef9aa2 [formerly e425e5bf8c ] [formerly f0875e724f ] [formerly 611e036e75 [formerly f0875e724f [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]]]]
Former-commit-id: 611e036e75
Former-commit-id: 0015f2440e [formerly 3b9653ef00 ] [formerly c73653650f9ff8397fc5371a4686056fcc738000 [formerly caf5f778e9 ]]
Former-commit-id: 8382ee6ae605cca7bbd88f333d4d1875fc119a63 [formerly 4425e3db61 ]
Former-commit-id: 0d6ef0345d
|
2014-09-02 16:30:51 -04:00 |
|
Nate Jensen
|
55b8cace97
|
Merge "Omaha #3569 Split Volume Browser planes menus into multiple reusable components." into omaha_14.4.1
Former-commit-id: 2d5df2705f [formerly e673ed62bd ] [formerly 2c209af1fa ] [formerly 2d5df2705f [formerly e673ed62bd ] [formerly 2c209af1fa ] [formerly fe457e89a7 [formerly 2c209af1fa [formerly 09d7406f13949cf6a90164b06742c80ba2e18110]]]]
Former-commit-id: fe457e89a7
Former-commit-id: 23e2185306 [formerly 675bf92355 ] [formerly d45ff0db4fb7b24b0d0dac7dd89e774e93c37f76 [formerly 5661124038 ]]
Former-commit-id: d73ffe2ac6152190335275c8b09eca38523eb2c5 [formerly 84a107c8fa ]
Former-commit-id: 070ef331b9
|
2014-09-02 09:53:25 -05:00 |
|
Mark Peters
|
d1154bbe63
|
Omaha #3569 Split Volume Browser planes menus into multiple reusable components.
Change-Id: Idb7fa5d1b5cd5a53db38545c942c4c0bae19c3c9
Former-commit-id: b906c8054b [formerly 86b9016338 ] [formerly 097ce54969 ] [formerly b906c8054b [formerly 86b9016338 ] [formerly 097ce54969 ] [formerly 91f2b365a1 [formerly 097ce54969 [formerly a0864eff6efa679cdc0f58cd408102e32145f22c]]]]
Former-commit-id: 91f2b365a1
Former-commit-id: adae10c2d0 [formerly abd256ab93 ] [formerly b7fb901b9427a42706a36a3d4c34c6103d17ca1a [formerly 54f9a37e6c ]]
Former-commit-id: 7ce1fb859b9af8c7ab75518422673df67174e57b [formerly a3c382c0f7 ]
Former-commit-id: 9cab14d5b6
|
2014-08-29 15:05:29 -05:00 |
|
Ana Rivera
|
e57246c6ce
|
VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1
Former-commit-id: b03dd41331 [formerly e033ed5546 ] [formerly 160dabc4d1 ] [formerly b03dd41331 [formerly e033ed5546 ] [formerly 160dabc4d1 ] [formerly 9af77831a6 [formerly 160dabc4d1 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]]]
Former-commit-id: 9af77831a6
Former-commit-id: ae4ea166aa [formerly 2045699212 ] [formerly 55222fba76e6458ccc65b959b86f2e7bff061cbc [formerly fbe4d57f6b ]]
Former-commit-id: f1c71d002deedd0c02aa5622f474ac29e9b2dd09 [formerly dee335f370 ]
Former-commit-id: aec8eba1a7
|
2014-08-28 18:38:26 +00:00 |
|
Roger Ferrel
|
1b663590b4
|
Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml.
Former-commit-id: 2944c3770f [formerly 0147449477 ] [formerly fa42c4069a ] [formerly 2944c3770f [formerly 0147449477 ] [formerly fa42c4069a ] [formerly 9154ef60bb [formerly fa42c4069a [formerly 474e07b299246aee4e6b214226c176c4a10aa866]]]]
Former-commit-id: 9154ef60bb
Former-commit-id: db74982258 [formerly 17a8bd795d ] [formerly 9c8c9bee1d8c31a829aaaca5968d61664e6d90fe [formerly 63a1b2890b ]]
Former-commit-id: 5974e03bca22ea6311652bc9faaa322fe570944a [formerly 6e695a12d1 ]
Former-commit-id: 87b0200274
|
2014-08-27 15:06:52 -05:00 |
|