Commit graph

3599 commits

Author SHA1 Message Date
Ana Rivera
d2a979a0e5 VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
This reverts commit 227ca65a041b4cf1c6930926ce67b7f4394e1097 [formerly f1f5f2c717] [formerly 53b96c2b8e [formerly c245f3a3c4] [formerly 53b96c2b8e [formerly c245f3a3c4] [formerly f1f5f2c717 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]]].

Change-Id: I631bb1722abea96e08967a8d9fa9f175a886f685

Former-commit-id: eb0253f820 [formerly 0e8473e91e] [formerly eb0253f820 [formerly 0e8473e91e] [formerly 5abf37ea62 [formerly 373acfce57d5e0044f13382b926cb2fc1f830e54]]]
Former-commit-id: 5abf37ea62
Former-commit-id: 79b19d6368 [formerly 7c3dd12351]
Former-commit-id: 899a9d762d
2014-12-02 13:43:03 +00:00
Nate Jensen
6a53100fb7 Omaha #3549 remove dead code
Change-Id: I17d4d7536e86d022726fa5cee389dad67fca9ee8

Former-commit-id: a4a3cc6deb [formerly faf88fc3cb] [formerly a4a3cc6deb [formerly faf88fc3cb] [formerly 731cf6fdbe [formerly b594cd797b675120634454ffffccbb785fd917ae]]]
Former-commit-id: 731cf6fdbe
Former-commit-id: d903df671b [formerly d28b902955]
Former-commit-id: 77892d1ba0
2014-12-01 15:23:48 -06:00
Richard Peter
c9bc7ef69b Merge "Omaha #3870 Updated table to include missing elements." into omaha_14.4.1
Former-commit-id: 1a88edfa4f [formerly 6d046826dc] [formerly 1a88edfa4f [formerly 6d046826dc] [formerly 6759ffa76c [formerly e7056504ae5758e2b4abbdef9cec7b2467d49add]]]
Former-commit-id: 6759ffa76c
Former-commit-id: 394674436a [formerly 25407d6fdd]
Former-commit-id: 30f04ed077
2014-11-26 10:13:40 -06:00
Roger Ferrel
c9e9fc7bd0 Omaha #3870 Updated table to include missing elements.
Former-commit-id: 0ae4219196 [formerly c4cf624d04] [formerly 0ae4219196 [formerly c4cf624d04] [formerly fedc4aae8a [formerly 7569e4f2b962d22453b7414ea882f2383cec9ade]]]
Former-commit-id: fedc4aae8a
Former-commit-id: a170a1318d [formerly e3d4250f65]
Former-commit-id: be828d05e5
2014-11-25 14:31:05 -06:00
Roger Ferrel
c79c325df6 Omaha #3866 Configuration files for GFS20KM for product and volume browsers.
Former-commit-id: da25f4588d [formerly 9b986c7cf8] [formerly da25f4588d [formerly 9b986c7cf8] [formerly 0df840602e [formerly 56833ab1b84e50c6ca4150d3c90501448233313b]]]
Former-commit-id: 0df840602e
Former-commit-id: 2d763dc64a [formerly 4ba718da37]
Former-commit-id: 975ee3aba9
2014-11-25 10:01:30 -06:00
Evan Polster
f0fb521f6a Merge "VLab Issue #5069 Files for DR 14006." into gsd_14.4.1
Former-commit-id: 82523e7ef1 [formerly 78a4d3425b] [formerly 82523e7ef1 [formerly 78a4d3425b] [formerly b7b2087e1f [formerly f0d0953f6fe1bc6d2ace9dce159a6354a2c55264]]]
Former-commit-id: b7b2087e1f
Former-commit-id: a6bd1e6c7b [formerly 2e135d26b5]
Former-commit-id: bd30bb5b20
2014-11-21 13:30:59 -05:00
Zihou Wang
de979397f4 VLab Issue #5020 - DCS_16776 Ingest and display MBA; fixes #5020
Change-Id: I5206e4efa240924caf07c4499bfb3b4cdf5aee5d

Former-commit-id: 8d24be996a [formerly 4fe74892ea] [formerly 8d24be996a [formerly 4fe74892ea] [formerly 5c86a177b7 [formerly e5e15da2f57e336d8f23444ab0932b710ad2c033]]]
Former-commit-id: 5c86a177b7
Former-commit-id: 30be251dc9 [formerly d4ca49f01d]
Former-commit-id: a47f4908e7
2014-11-21 15:42:48 +00:00
Ying-Lian.Shi
721eb16f24 ASM #98 GFE: ifpnetCDF no longer gives an error code in some cases
Change-Id: I74e78b7d64fef4538ded4ed0e4e4b13d1950363a

Former-commit-id: 261177ee7c [formerly a0bfede4e0] [formerly 261177ee7c [formerly a0bfede4e0] [formerly 7c99c63441 [formerly 98c99131445b4b9fa727a9ea09fc4df8906aa90b]]]
Former-commit-id: 7c99c63441
Former-commit-id: cfb854914d [formerly 0a2c6b0f66]
Former-commit-id: a861c7f04e
2014-11-21 15:38:25 +00:00
Ana Rivera
eb1f2809b0 Merge branch 'master_14.4.1' into emc_14.4.1
Change-Id: I4984b06810f3484e919a4a4a5853435ca34167bb

Former-commit-id: 02e630bc93 [formerly 1645ccd9ca] [formerly 02e630bc93 [formerly 1645ccd9ca] [formerly 1999049d90 [formerly c69e94f227cb908a9af2e1cd2db35b25bef28701]]]
Former-commit-id: 1999049d90
Former-commit-id: 0fcfcbc05b [formerly 95b016ef4e]
Former-commit-id: e5f6dae5bd
2014-11-21 14:23:49 +00:00
Ana Rivera
832d246a59 Merge "VLab Issue #4949 - DR17399 Add PPS products to ASR/ARSR menu; fixes #4949" into field_14.4.1
Former-commit-id: 73c3b0f24a [formerly 2bc144f4ab] [formerly 73c3b0f24a [formerly 2bc144f4ab] [formerly 7f2d7fa4da [formerly 25621f54d48002d79b0fa80c12f7310580432374]]]
Former-commit-id: 7f2d7fa4da
Former-commit-id: 71fc661bf6 [formerly e41e55ce60]
Former-commit-id: 05ec271272
2014-11-20 18:33:54 -05:00
Fay.Liang
d7f86a9a63 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 069db81e14 [formerly 99263f79e1] [formerly 069db81e14 [formerly 99263f79e1] [formerly 5bd22b74c6 [formerly 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9]]]
Former-commit-id: 5bd22b74c6
Former-commit-id: acdabae0ab [formerly 7aa08b8ba4]
Former-commit-id: 59f64b29b1
2014-11-20 13:32:25 -05:00
Shawn Hooper
6699c18a7a VLab Issue #5395 - Build fixes and gfeConfig.py update
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: fd57e5334c [formerly b7369c5eef] [formerly fd57e5334c [formerly b7369c5eef] [formerly cf72b5753d [formerly 94093accc4b2adc4c12cea0a3af0e037c1be52d8]]]
Former-commit-id: cf72b5753d
Former-commit-id: 2f954d65be [formerly 330eae9f9e]
Former-commit-id: b6d1f3aef4
2014-11-20 13:12:16 -05:00
Ana Rivera
35dd2f3c52 Merge branch 'master_14.4.1' into field_14.4.1
Change-Id: I4ffce1e09a6ad2c8a2428907a8b8e2bcedcefe4c

Former-commit-id: 6749c3e52f [formerly b377106409] [formerly 6749c3e52f [formerly b377106409] [formerly 0fa5c4e483 [formerly ea2276a9ac116613b032828e4a4b82f67fc6ba8d]]]
Former-commit-id: 0fa5c4e483
Former-commit-id: 506895ce06 [formerly 729e77624e]
Former-commit-id: 8c29e1de8c
2014-11-20 16:17:42 +00:00
Fay.Liang
5c3a6d006c Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: a32ec39df2 [formerly 29561d5324] [formerly a32ec39df2 [formerly 29561d5324] [formerly 45b80432d6 [formerly 28c3dbd91c1e89ffffd19afa811a08e228a995dd]]]
Former-commit-id: 45b80432d6
Former-commit-id: a75d5d336d [formerly de4ab82df7]
Former-commit-id: e61707aefc
2014-11-19 22:07:54 -05:00
Ana Rivera
b776357dad Merge "VLab Issue #4953 Added support for managing JSON files in practice mode." into tcv_14.3.2
Former-commit-id: 419dc9ff10 [formerly 7dacc070d2] [formerly 419dc9ff10 [formerly 7dacc070d2] [formerly 40855f4ebd [formerly a0946643e3dab3f54c9d1d7a48dbb06b82207b55]]]
Former-commit-id: 40855f4ebd
Former-commit-id: 168fe90936 [formerly ae6d3b9e33]
Former-commit-id: babb82777c
2014-11-19 16:27:03 -05:00
Ana Rivera
b9cdd89b29 VLab Issue #5382 - HTI Update: add GFE templates (O&M RM16791); fixes #5382
Change-Id: I1a37fafbb9c2846749a33dd85772f53ccfb514df

Former-commit-id: befcdc96f9 [formerly 2c388bd379] [formerly befcdc96f9 [formerly 2c388bd379] [formerly af00fd8a98 [formerly 7d9cf7bfb3f513314608b6269f437061fc36d090]]]
Former-commit-id: af00fd8a98
Former-commit-id: 28033b25f7 [formerly dd4a60d370]
Former-commit-id: 9a2763a294
2014-11-19 20:29:42 +00:00
Ron Anderson
727b5f7c57 VLab Issue #4953 Added support for managing JSON files in practice mode.
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8

Former-commit-id: f88fc45470 [formerly bb451e58c3] [formerly f88fc45470 [formerly bb451e58c3] [formerly 9104023408 [formerly e8ac81c5850b8565ea1e375857cf9dfe531848a0]]]
Former-commit-id: 9104023408
Former-commit-id: 72e6e56c75 [formerly 0991f722ec]
Former-commit-id: 2e14733f66
2014-11-19 11:31:49 -06:00
Roger Ferrel
4006dd2e2b Issue #3439 Replaced GFS213 with GFS229.
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15

Former-commit-id: 85d717b49c [formerly 90a8b262f3] [formerly 85d717b49c [formerly 90a8b262f3] [formerly b88300a5fc [formerly 6cb88075375e3703b5ffe559ebd5e4f57d016880]]]
Former-commit-id: b88300a5fc
Former-commit-id: b86d906a5a [formerly 83c738abd9]
Former-commit-id: 6e58de9ef0
2014-11-18 17:42:39 -06:00
Mike Duff
4116e82f67 Issue #3026 - Fixed pattern to match the actual file names
Change-Id: I957e2076cfa5ee4d59acc1a0db89066e446bfc99

Former-commit-id: edb85525d0 [formerly 9be37bb41e] [formerly edb85525d0 [formerly 9be37bb41e] [formerly f841f1eda9 [formerly 5a3ccbadbf08957a4f68a0cb7118c765ca44f849]]]
Former-commit-id: f841f1eda9
Former-commit-id: 1f1436a0da [formerly f1c4463316]
Former-commit-id: f30552c6de
2014-11-18 13:54:17 -06:00
Steve Harris
4bbeef346b Merge tag 'OB_14.3.1-33m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java

Former-commit-id: bab60d0d89 [formerly e1106f77eb] [formerly bab60d0d89 [formerly e1106f77eb] [formerly 1d18722dca [formerly 9c77ee7c19b87501983acf88279205644e1692f2]]]
Former-commit-id: 1d18722dca
Former-commit-id: 602bd4ce21 [formerly c2309d6d4a]
Former-commit-id: d887ad316f
2014-11-17 14:31:43 -06:00
Fay.Liang
1def1c0d2e Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: e78e70cb81 [formerly 766685c4ec] [formerly e78e70cb81 [formerly 766685c4ec] [formerly 8ced3a4c73 [formerly 7fd3b02016b0d9eed7ecca9c2fd70c3f83695abc]]]
Former-commit-id: 8ced3a4c73
Former-commit-id: fc4643d2eb [formerly b7da8368d3]
Former-commit-id: 72a92ec456
2014-11-14 12:47:46 -05:00
Lee Venable
06c35b4096 Merge "Omaha #3741 - Updated procedures for calculation of a center for zone and station." into omaha_14.4.1
Former-commit-id: 2bcf529bd9 [formerly f198da3f4d] [formerly 2bcf529bd9 [formerly f198da3f4d] [formerly 9fde70a354 [formerly b6d35ac4e3aa430de7057a16f9d5516584833150]]]
Former-commit-id: 9fde70a354
Former-commit-id: 58cf38e8f0 [formerly aba5c0cc19]
Former-commit-id: 521a4549f7
2014-11-14 11:14:16 -06:00
Ana Rivera
75bce54e24 VLab Issue #5318 - Baseline Hurricane Threats and Impacts (O&M RM16791); fixes #5318
Change-Id: Ibbc9e39a294417524c57c86e68e92644433ba847

Former-commit-id: 499c58a253 [formerly 061fd0af28] [formerly 499c58a253 [formerly 061fd0af28] [formerly e54f3305d8 [formerly 8a4e53a23a222dc88e3db8cc053fc31c33d3ed42]]]
Former-commit-id: e54f3305d8
Former-commit-id: e49972bfcd [formerly 23b3f1bc77]
Former-commit-id: c7e3d0197c
2014-11-14 16:58:11 +00:00
Mark Peters
367f14a388 Omaha #3760 Moved to grid the remainder of derived parameters with no other explicit references
Change-Id: Ifb12010b4527c18b4e498b5de5757bb74634b496

Former-commit-id: 36ebe9468c [formerly a3725b43bc] [formerly 36ebe9468c [formerly a3725b43bc] [formerly 7ae2b9524b [formerly fa93950435431248bd5790788e3a6936b4f4de2b]]]
Former-commit-id: 7ae2b9524b
Former-commit-id: e6e0af04c3 [formerly ee766624c5]
Former-commit-id: 47410b9117
2014-11-13 13:34:42 -06:00
Fay.Liang
51c57e8b48 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: aef63b4991 [formerly 3ed251486c] [formerly aef63b4991 [formerly 3ed251486c] [formerly cfe2f18790 [formerly 3f94c7f0ddbf580576b435a715366e3b9f3d9a53]]]
Former-commit-id: cfe2f18790
Former-commit-id: cc1cda2e98 [formerly e3c647e49e]
Former-commit-id: 2730ff96c6
2014-11-13 11:50:16 -05:00
Lee Venable
f9fdd8ac05 Merge "Issue #3026 - fixes to data access for HPE label generation" into omaha_14.3.1
Former-commit-id: f18c963895 [formerly 6b127b488d] [formerly f18c963895 [formerly 6b127b488d] [formerly f5bcc5b2c2 [formerly 389c35bce7c456154321605c3415c43431a46c7b]]]
Former-commit-id: f5bcc5b2c2
Former-commit-id: 630c2c7e7a [formerly 3a05aecbd6]
Former-commit-id: 29e2674ed5
2014-11-13 09:31:57 -06:00
Mike Duff
5cc3280353 Issue #3026 - fixes to data access for HPE label generation
Former-commit-id: b43c8557cd [formerly 8503cc25a7] [formerly b43c8557cd [formerly 8503cc25a7] [formerly 15f9d1ef50 [formerly 8d30af1c970cca70fe74560d3157e754e1164785]]]
Former-commit-id: 15f9d1ef50
Former-commit-id: 9cec2bd0e6 [formerly 4ede0f150c]
Former-commit-id: 04b7ae9256
2014-11-12 18:34:32 -06:00
Ron Anderson
66c29416f7 VLab Issue #4953 Added support for writing Python and/or Java objects to JSON localization files.
Change-Id: Ie25fce637e4294dd20bcfa3933d29b7bf6cc1f30

Former-commit-id: 80670c1b7a [formerly 04b8ffbcd2] [formerly 80670c1b7a [formerly 04b8ffbcd2] [formerly fe531a33e5 [formerly c9d45db2fe6d4693c02b8788d0c7d44b21f5359f]]]
Former-commit-id: fe531a33e5
Former-commit-id: 19800d6f27 [formerly 0a6164461a]
Former-commit-id: 692de129af
2014-11-12 14:50:21 -06:00
Ben Steffensmeier
29d60f4f53 Omaha #3805 Increase time of cluster lock, cleanup statictopo plugin.
Former-commit-id: 0a0cad6ed5 [formerly 11966fc0de] [formerly 0a0cad6ed5 [formerly 11966fc0de] [formerly 5c65750e82 [formerly 9bbd3f9f8dea46b14d77b796d0ea00285628ea75]]]
Former-commit-id: 5c65750e82
Former-commit-id: ec4f90760a [formerly 14f666f8e8]
Former-commit-id: f979b530d0
2014-11-12 12:50:17 -06:00
Ron Anderson
3f2d2840d2 Issue #2854 Fix merge issue in MessageProducer between DRs 2726 and 3684
Change-Id: I6a6ea9c57857459f61e955a54275a8983a8004ce

Former-commit-id: 755fdd1950 [formerly a60e3465f4] [formerly 755fdd1950 [formerly a60e3465f4] [formerly 654c831b4e [formerly 09f13d9b33cfe3547d2dc3fb75c1673e1f3193b0]]]
Former-commit-id: 654c831b4e
Former-commit-id: dac3e5320a [formerly 47be7dc5a8]
Former-commit-id: 018fa61174
2014-11-12 11:25:32 -06:00
Mark Peters
47d615fdb4 Omaha #3760 Moved derived parameters with radarVWP model to radar plugin
Change-Id: I57e6d8177eb483e14154b4bf0a1d86b71f40655f

Former-commit-id: abc4361a65 [formerly 9498a60e7b] [formerly abc4361a65 [formerly 9498a60e7b] [formerly 31701eeb9c [formerly e156d9527a0dd5fb25aca0264f1fddf546e60acf]]]
Former-commit-id: 31701eeb9c
Former-commit-id: 50ce1c6db6 [formerly c1ca8b1301]
Former-commit-id: 942daea6c7
2014-11-11 17:16:51 -06:00
Nate Jensen
415684bb4f Merge "Omaha #3760 Moved derived parameters with grid models to grid plugin" into omaha_14.4.1
Former-commit-id: fb577a5a04 [formerly f1c0b33254] [formerly fb577a5a04 [formerly f1c0b33254] [formerly c62edc0486 [formerly c2d32105c4cd1e7acb52b84ba23d119720888c96]]]
Former-commit-id: c62edc0486
Former-commit-id: b10471c457 [formerly d1e6159f2d]
Former-commit-id: 4c48956280
2014-11-11 17:09:08 -06:00
Mark Peters
5142772560 Omaha #3760 Moved derived parameters with grid models to grid plugin
Change-Id: I7ac459804b50872203103eb0e2b8a833aa1015ba

Former-commit-id: f60b1ac8ae [formerly 805bc7c7bc] [formerly f60b1ac8ae [formerly 805bc7c7bc] [formerly cea38f3162 [formerly 314e0cd90be176af62c452d44ea53587a2408c5d]]]
Former-commit-id: cea38f3162
Former-commit-id: 6974f6f099 [formerly df329c59fe]
Former-commit-id: 014043307e
2014-11-11 15:21:02 -06:00
Slav Korolev
d9212b257d Omaha #3741 - Updated procedures for calculation of a center for zone and station.
Former-commit-id: ec877476d9 [formerly a873fe7b5c] [formerly ec877476d9 [formerly a873fe7b5c] [formerly 6343f04511 [formerly a34a8901f83457fa21fc99a0f2ff0df956487b62]]]
Former-commit-id: 6343f04511
Former-commit-id: ec6064a4e6 [formerly 2e5a706e47]
Former-commit-id: 00c5b05943
2014-11-11 14:56:21 -05:00
Nate Jensen
e2f4d0dd19 Omaha #3549 improve logging of findDataTime errors
Change-Id: Ie1af1aac1750ebc42257d3dd3e448bb95801cceb

Former-commit-id: 73ce6473f6 [formerly 9d52d4eb5c] [formerly 73ce6473f6 [formerly 9d52d4eb5c] [formerly aebd4b5849 [formerly 7a1dd6c72261fb0c1118cea226b5c31c8225b1c7]]]
Former-commit-id: aebd4b5849
Former-commit-id: fbd2278f88 [formerly 55078a2d9d]
Former-commit-id: e5bc4d657a
2014-11-11 09:54:18 -06:00
Nate Jensen
a92219b5e2 Merge "Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30." into omaha_14.4.1
Former-commit-id: 3445c780cf [formerly a3366c9417] [formerly 3445c780cf [formerly a3366c9417] [formerly 403e470682 [formerly 8f7fa6b23c7a20b15c5f9bdfdac5add17aab336e]]]
Former-commit-id: 403e470682
Former-commit-id: f272fe312b [formerly d48008929d]
Former-commit-id: 4e66eb66d6
2014-11-11 09:11:18 -06:00
Fay.Liang
e412968949 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: e9c6950cc3 [formerly 74d7123627] [formerly e9c6950cc3 [formerly 74d7123627] [formerly 4bef6cf18d [formerly a141921090ecec459e99d448025f58ca6a957fa6]]]
Former-commit-id: 4bef6cf18d
Former-commit-id: 9bb87255ec [formerly d7ae488e81]
Former-commit-id: 8cf37070ec
2014-11-10 14:08:25 -05:00
Sarah Pontius
1bef94711f VLab Issue #5277 - HLS/TCV code for OPG 11-17-2014; fixes #5277
Change-Id: I258b2f8c8ddb7f45b02b1035f6fa5006b9fabe1b

Former-commit-id: d20799e942 [formerly 1ae8fe99aa] [formerly d20799e942 [formerly 1ae8fe99aa] [formerly 061583cd50 [formerly 0db3944372ecc381df4e8a918829530391d598db]]]
Former-commit-id: 061583cd50
Former-commit-id: 853526b594 [formerly bc572fc945]
Former-commit-id: ead17c3751
2014-11-10 11:20:09 -07:00
Nate Jensen
305dc41c71 Merge "Omaha #3760 Move appropriate derived parameters to bufrmos, bufrua, lsr" into omaha_14.4.1
Former-commit-id: a0e806d6ce [formerly 13645f54d4] [formerly a0e806d6ce [formerly 13645f54d4] [formerly ef862c6430 [formerly ea80beca2d0da38d31e0fde21414c7b481c8f61d]]]
Former-commit-id: ef862c6430
Former-commit-id: 0ea953d2e3 [formerly bb28405302]
Former-commit-id: 618a3d6b09
2014-11-10 11:19:40 -06:00
Nate Jensen
fc540378c2 Merge "Omaha #3760 Move derived parameter definitions to grid plugin" into omaha_14.4.1
Former-commit-id: 2118f963ce [formerly 1a59453949] [formerly 2118f963ce [formerly 1a59453949] [formerly 12979ce976 [formerly c9856a64e466695be51903d88ba9f87b0286b19b]]]
Former-commit-id: 12979ce976
Former-commit-id: fcb1aa2f87 [formerly 8e9d4a08dd]
Former-commit-id: 2073e43e24
2014-11-10 11:17:16 -06:00
Steve Harris
399b05ad5e 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: a8a97501ac [formerly a16abe1b8b] [formerly a8a97501ac [formerly a16abe1b8b] [formerly 9de825c332 [formerly 565efec2ebe5a3a1a009d213a77617f4a593aa6b]]]
Former-commit-id: 9de825c332
Former-commit-id: 548f32e067 [formerly 5e6aa15038]
Former-commit-id: 2695a061f4
2014-11-10 08:42:01 -06:00
David Lovely
0b76e0a9b6 Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30.
Change-Id: Ib28bf8e2edb3b299a7122bac7c80f302780b7470

Former-commit-id: b32d54c7f9 [formerly 625e83c445] [formerly b32d54c7f9 [formerly 625e83c445] [formerly 1a191cac55 [formerly 3addb3007b0bf7aab88b423bbf700583fc2b3e48]]]
Former-commit-id: 1a191cac55
Former-commit-id: 3b7d20e623 [formerly b9451471ac]
Former-commit-id: 1b3334a183
2014-11-10 08:27:28 -06:00
Mark Peters
f9511f6990 Omaha #3760 Move derived parameter definitions to grid plugin
Change-Id: I760f2a61e270c38e92c4321489d2b2220d55129b

Former-commit-id: de182355d5 [formerly 131ee29479] [formerly de182355d5 [formerly 131ee29479] [formerly 24f13ec749 [formerly 4c8316b98529d111b24ca7fdfd10d62ba6058148]]]
Former-commit-id: 24f13ec749
Former-commit-id: e378bf783d [formerly 2222f45b98]
Former-commit-id: e0236db551
2014-11-07 16:56:22 -06:00
Mark Peters
f4c8036df5 Omaha #3760 Move appropriate derived parameters to bufrmos, bufrua, lsr
Change-Id: Ic8f3675e7d50cc4b5803bb2c6991ef860afa4dd8

Former-commit-id: 1ce9bac740 [formerly 724cb2e7d2] [formerly 1ce9bac740 [formerly 724cb2e7d2] [formerly b2e7cb64e7 [formerly 06fed9a6d76c59c77e12fec2789707e46df44817]]]
Former-commit-id: b2e7cb64e7
Former-commit-id: 6e08970030 [formerly abf3102d6e]
Former-commit-id: dfc692f1af
2014-11-07 16:17:24 -06:00
Mark Peters
63eab8e51b Omaha #3760 Derived parameter definitons for ldadhydro and obs split to appropriate plugins
Change-Id: I61d7553d300a173bb64d09898c76c23a0ef94241

Former-commit-id: db6fe6bb30 [formerly 80454c815d] [formerly db6fe6bb30 [formerly 80454c815d] [formerly 7c6d46d33a [formerly dc5f62b485b32bea22d9886e22fe053163aff19a]]]
Former-commit-id: 7c6d46d33a
Former-commit-id: e48dfda21c [formerly 8587464689]
Former-commit-id: 7f33db1f72
2014-11-07 14:05:04 -06:00
Mark Peters
0a37ff3dfb Omaha #3760 Derived parameter definitions should be split to appropriate plugins
Change-Id: I9dfd7623b778e64982dd2de6f00d944c90401611

Former-commit-id: 9d6ddb5cec [formerly 2ee1a9b31f] [formerly 9d6ddb5cec [formerly 2ee1a9b31f] [formerly 54139d0b0c [formerly d4da6be1b1972df984ea1fb3eb1c5476af5d4cfa]]]
Former-commit-id: 54139d0b0c
Former-commit-id: 7ee53bf981 [formerly cee5c4fc4b]
Former-commit-id: 8ab327d689
2014-11-07 12:09:04 -06:00
Richard Peter
9c3704dd59 Merge "Omaha #3788 Switch satellite_spatial.gid to a sequence." into omaha_14.4.1
Former-commit-id: b5db573517 [formerly 9047da36ae] [formerly b5db573517 [formerly 9047da36ae] [formerly 4d143654fe [formerly 4b78380f15df6a8d9a35eb7a2b976b982e949243]]]
Former-commit-id: 4d143654fe
Former-commit-id: 3918ef6b8f [formerly fbd7eb38be]
Former-commit-id: 7dcd409481
2014-11-07 11:18:54 -06:00
Ben Steffensmeier
a25cb9d62c Omaha #3788 Switch satellite_spatial.gid to a sequence.
Former-commit-id: f6a74c59f7 [formerly 5d40da982a] [formerly f6a74c59f7 [formerly 5d40da982a] [formerly 7988d740b0 [formerly 919f4ca671ca953b881037e4a69d720d3bf79eb5]]]
Former-commit-id: 7988d740b0
Former-commit-id: bae0a4f665 [formerly 07b91982bb]
Former-commit-id: 6a155a41dc
2014-11-07 10:23:39 -06:00
Richard Peter
532ee1b6b7 Merge "Omaha #3353 Fix deadlock that freezes cave." into omaha_14.4.1
Former-commit-id: 4608c2ff2c [formerly b92033924b] [formerly 4608c2ff2c [formerly b92033924b] [formerly f1499db1c3 [formerly 24f3f08d27ac6d3e2cba7b5f6f5a3fd8e6452700]]]
Former-commit-id: f1499db1c3
Former-commit-id: bd7a9c2327 [formerly 6cf6dff0f1]
Former-commit-id: 6995c6b05c
2014-11-07 09:50:34 -06:00
Dave Hladky
33a80a9ef0 Omaha #3798 Merge Fixes
Former-commit-id: 302464acda [formerly 2c61cae7ab] [formerly 302464acda [formerly 2c61cae7ab] [formerly 7f051d34e6 [formerly 011a9d5b937e1a8a337ffaf04ba47cd7080ffaf5]]]
Former-commit-id: 7f051d34e6
Former-commit-id: 08b98856aa [formerly 78e91a0c62]
Former-commit-id: 161d54e8ec
2014-11-06 12:09:42 -06:00