Commit graph

3019 commits

Author SHA1 Message Date
Benjamin Phillippe
55f7eabc96 Omaha #3255 Registry Security Features (commit 1/5)
Change-Id: I3b24ae8696ded86d8157a092eeff81cc45a2f291

Former-commit-id: e05f09bb20 [formerly cfe7bb251f] [formerly e05f09bb20 [formerly cfe7bb251f] [formerly fb9e936e0e [formerly ec1b81d28c4b418fada53c684e78d397fee9b97d]]]
Former-commit-id: fb9e936e0e
Former-commit-id: d46a6df3e0 [formerly c523752519]
Former-commit-id: 31aeb53f7c
2014-06-12 11:26:51 -05:00
Slav Korolev
d6ef83e619 Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 8175aad0bf [formerly 2b877529ce] [formerly 8175aad0bf [formerly 2b877529ce] [formerly 16ec392c12 [formerly 0172e8f27b646a965e472f969f112a4e170d9f41]]]
Former-commit-id: 16ec392c12
Former-commit-id: fec8eb4fae [formerly d8ebeb4778]
Former-commit-id: a66dd879c7
2014-06-12 12:24:34 -04:00
Brian Clements
043cde3d60 Omaha #3229 added bufr buoy support
small bufr obs refactor
fixed empty array issue in bufr parser

Change-Id: Ie21ffdafed8b137264db4751c147ce1dd13eabd2

Former-commit-id: 2e0408ca10 [formerly 99e86f95be] [formerly 2e0408ca10 [formerly 99e86f95be] [formerly 5be93b4084 [formerly 763ea813523d2e6a6da3fb6a80c94939ce605f6c]]]
Former-commit-id: 5be93b4084
Former-commit-id: 87f60d2e22 [formerly bab2785b71]
Former-commit-id: 659e83127b
2014-06-12 10:12:13 -05:00
Ron Anderson
c0442f63b0 Omaha #3244 Improved GFE purge error handling
Change-Id: I18fcf443b6c77a323df76659a8a60cb10b65669c

Former-commit-id: 65fbf7f61e [formerly 366e5d7fd3] [formerly 65fbf7f61e [formerly 366e5d7fd3] [formerly 9ac1f19455 [formerly d8955e6dcd8f16b33c54de104596e9743ce7d85e]]]
Former-commit-id: 9ac1f19455
Former-commit-id: 6627d6c913 [formerly 864cfd2c30]
Former-commit-id: 75ac1a92a8
2014-06-12 08:05:56 -05:00
Brian.Dyke
40fb1f6159 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: e802508e98 [formerly a011c0b6bb] [formerly e802508e98 [formerly a011c0b6bb] [formerly 6fcc2604e0 [formerly 0d441b5eebad07acf51d6d5c28ee5ac7770d9733]]]
Former-commit-id: 6fcc2604e0
Former-commit-id: 50073f34b2 [formerly 10696504a0]
Former-commit-id: ac235bf20a
2014-06-12 07:07:17 -04:00
Nate Jensen
b74f6a74dc Merge "Omaha #3090 - Added files missed from merging omaha_14.3.1 into omaha_14.4.1 (b6055725)" into omaha_14.4.1
Former-commit-id: eaca89ac58 [formerly 944dee69a4] [formerly eaca89ac58 [formerly 944dee69a4] [formerly 967a446097 [formerly c2e210b7157f82a2a1af625d805e3a6751ff6d0d]]]
Former-commit-id: 967a446097
Former-commit-id: 5821cbfa84 [formerly cae40316cf]
Former-commit-id: 2192ad6036
2014-06-11 17:12:07 -05:00
Steve Harris
b4de28ee62 Omaha #3090 - Added files missed from merging omaha_14.3.1 into omaha_14.4.1 (b6055725)
Former-commit-id: 975bfdf386 [formerly 6d58f3944e] [formerly 975bfdf386 [formerly 6d58f3944e] [formerly fbc6c6c31b [formerly 81aab5e7001eca87d4d8889ae96367eee433ee88]]]
Former-commit-id: fbc6c6c31b
Former-commit-id: 1abf5019f1 [formerly e53dfdfdca]
Former-commit-id: 22841c139e
2014-06-11 16:00:09 -05:00
Ben Steffensmeier
b34d064933 Omaha #2061 Fix ogc reference to Metar units.
Former-commit-id: a05e030431 [formerly 048ee71f6a] [formerly a05e030431 [formerly 048ee71f6a] [formerly cc957caac6 [formerly 4773eaa7d0736a4bd68270742b344a6e069ab0ea]]]
Former-commit-id: cc957caac6
Former-commit-id: 591815e868 [formerly 357eb13482]
Former-commit-id: 7dc9dab4b0
2014-06-11 14:41:13 -05:00
Nate Jensen
5675d45c5e Merge "Omaha #2061 Remove IDecoderGettable from all AWIPS2 Raytheon PDOs." into omaha_14.4.1
Former-commit-id: 39a3dae80e [formerly 63d90652a9] [formerly 39a3dae80e [formerly 63d90652a9] [formerly 69251c8d15 [formerly fd2ebb42c382855ab21cb409481905530fdda5de]]]
Former-commit-id: 69251c8d15
Former-commit-id: 419dba85eb [formerly 9cc5e402a6]
Former-commit-id: 9379fd4c65
2014-06-11 13:09:25 -05:00
Steve Harris
435da06069 Merge branch 'master_14.2.2' (14.2.2-13) into omaha_14.2.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: If5dae78936eddf1bc4ee63f35beb96a0cb9defb9

Former-commit-id: 3a3277c469 [formerly ad6e9fa5ee] [formerly 3a3277c469 [formerly ad6e9fa5ee] [formerly 9510608b74 [formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]]]
Former-commit-id: 9510608b74
Former-commit-id: f78bc57920 [formerly 23dea36a2c]
Former-commit-id: 5a86a00518
2014-06-11 12:55:44 -05:00
Nate Jensen
71439d25cb Merge "Omaha #3226 added filter support for lightning data" into omaha_14.4.1
Former-commit-id: 5705b9afe5 [formerly 35875cad2f] [formerly 5705b9afe5 [formerly 35875cad2f] [formerly c2cb9b8dd6 [formerly 9251f2282ab4634483c2374615c97261f82fd7f3]]]
Former-commit-id: c2cb9b8dd6
Former-commit-id: 42aff6ba2e [formerly 450a0e7bc7]
Former-commit-id: 7547eccb7d
2014-06-11 12:48:47 -05:00
Ben Steffensmeier
3db0af5561 Omaha #2061 Remove IDecoderGettable from all AWIPS2 Raytheon PDOs.
Former-commit-id: a96199cc47 [formerly d838ecc734] [formerly a96199cc47 [formerly d838ecc734] [formerly 30415ae8c5 [formerly b6c63e5791a2438253d6ff039b5164c61105a941]]]
Former-commit-id: 30415ae8c5
Former-commit-id: 08a1e07918 [formerly eb7cf7e8da]
Former-commit-id: 02c4332c6a
2014-06-11 12:38:35 -05:00
Ana Rivera
eb270f539a VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e

Former-commit-id: 4b515bfd0a [formerly 65e90953c2] [formerly 4b515bfd0a [formerly 65e90953c2] [formerly 9da58db461 [formerly 83640ccce75b600d53a0d44ae1528c312b7947b5]]]
Former-commit-id: 9da58db461
Former-commit-id: e249a71765 [formerly 540a286595]
Former-commit-id: 5721d2df05
2014-06-11 17:35:55 +00:00
Brian Clements
6f3d62d15a Omaha #3226 added filter support for lightning data
Change-Id: Ie5b90aeb3662c01a637803b604ae1488140102a4

Former-commit-id: a3da85d395 [formerly a02a7a90c7] [formerly a3da85d395 [formerly a02a7a90c7] [formerly acc77a71b2 [formerly 6b2a618685dad201b1d88abc132d4a5e31251f58]]]
Former-commit-id: acc77a71b2
Former-commit-id: 3559f96d48 [formerly ab8204a348]
Former-commit-id: 31daa4d5a2
2014-06-11 11:38:45 -05:00
Ron Anderson
2326567b41 Merge "Omaha #3243 Update AWIPS2 references to remove deprecated lambert conformal creation." into omaha_14.4.1
Former-commit-id: 5925b63308 [formerly d8f063c6f8] [formerly 5925b63308 [formerly d8f063c6f8] [formerly b9caf16088 [formerly a8c8602f651e082d6eeeab1973d98546429b8ceb]]]
Former-commit-id: b9caf16088
Former-commit-id: ea15d8b471 [formerly 746272ac9a]
Former-commit-id: 017853385b
2014-06-11 07:59:30 -05:00
Nate Jensen
f5c593071a Merge "Omaha #2061 Delete PlotResource, rename PlotResource2." into omaha_14.4.1
Former-commit-id: be169a7f63 [formerly 6890ee0920] [formerly be169a7f63 [formerly 6890ee0920] [formerly 10207907d8 [formerly b0903898a40916383f88b920e87dfc072d9cafa9]]]
Former-commit-id: 10207907d8
Former-commit-id: 789d9be951 [formerly 33b22ece81]
Former-commit-id: 57f48654ac
2014-06-10 17:14:53 -05:00
Ben Steffensmeier
178b7509db Omaha #2061 Delete PlotResource, rename PlotResource2.
Former-commit-id: bcc7243358 [formerly 1e37d669d8] [formerly bcc7243358 [formerly 1e37d669d8] [formerly a98872cb89 [formerly b569c7c3e175ed1519576aea63048c3f675d3875]]]
Former-commit-id: a98872cb89
Former-commit-id: bbcec7c004 [formerly d40c6fd625]
Former-commit-id: 6a5b6dcf8e
2014-06-10 15:59:15 -05:00
Ben Steffensmeier
97976eea56 Issue #2661 Fix vector derived parameter.
Former-commit-id: 1f270a6059 [formerly cd60dc028a] [formerly 1f270a6059 [formerly cd60dc028a] [formerly 0a66c47341 [formerly 238043b8c4286e398176d4d6c78e585e33faa5da]]]
Former-commit-id: 0a66c47341
Former-commit-id: 07731bab04 [formerly 799f7baacc]
Former-commit-id: 90f23e48ad
2014-06-10 15:44:33 -05:00
Ben Steffensmeier
b04b2658f4 Omaha #3232 Add DynamicSerialize to radar hail prob packet.
Former-commit-id: aa0766584e [formerly 4240ad5c1b] [formerly aa0766584e [formerly 4240ad5c1b] [formerly 79cb8ebae8 [formerly 713371e38842d3f8fd26f4df83d4b201611cd002]]]
Former-commit-id: 79cb8ebae8
Former-commit-id: b480b2cec5 [formerly 5002a8a85e]
Former-commit-id: 73c7b9155c
2014-06-10 15:39:25 -05:00
Brian.Dyke
1ae1410e46 Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 0f07e14bf1 [formerly f72380ad60] [formerly 0f07e14bf1 [formerly f72380ad60] [formerly 9ab17ddecb [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 816dcf74e4 [formerly 49cd9574d9]
Former-commit-id: a4b39dfca5
2014-06-10 13:56:03 -04:00
Nate Jensen
903971b81c Merge "Omaha #3226 encryption support for total lightning" into omaha_14.4.1
Former-commit-id: 96153d789c [formerly 9b73096d46] [formerly 96153d789c [formerly 9b73096d46] [formerly 5dae467620 [formerly dd8b7377139e41168841b97a9cace0aca1c9da23]]]
Former-commit-id: 5dae467620
Former-commit-id: e82f0bc3f0 [formerly 680d230a2b]
Former-commit-id: 9b7d0eb595
2014-06-10 12:00:58 -05:00
Brian.Dyke
a39afc1dfa CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: ef5c74dece [formerly c1b3f9d180] [formerly ef5c74dece [formerly c1b3f9d180] [formerly 8874d41872 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]
Former-commit-id: 8874d41872
Former-commit-id: 4f0fc67b1f [formerly f568b5606a]
Former-commit-id: 81d732477e
2014-06-10 12:52:59 -04:00
Brian Clements
0d63b87633 Omaha #3226 encryption support for total lightning
Change-Id: I87af2d986830681d258c065304e3ebfb2d2af8db

Former-commit-id: ae54caa806 [formerly 93efa905a3] [formerly ae54caa806 [formerly 93efa905a3] [formerly d4c55244a1 [formerly fe199cb32b3fe33ac48f039888bd43d4fedd9820]]]
Former-commit-id: d4c55244a1
Former-commit-id: 30cd1b3413 [formerly 6ed7f5ce29]
Former-commit-id: 76e16d7bd9
2014-06-10 08:46:41 -05:00
Nate Jensen
4ed9b21f13 Omaha #3266 remove redbook menu util's use of dataURIs
Change-Id: I2181c18e1b934538e463679bc5bdcb4bb7e411a3

Former-commit-id: 771acd01b1 [formerly c401bb5992] [formerly 771acd01b1 [formerly c401bb5992] [formerly 5267f93292 [formerly 482349158b2275210fb366bc67eace6a3f3fc04e]]]
Former-commit-id: 5267f93292
Former-commit-id: 21c5f5fb0a [formerly d57e6d2503]
Former-commit-id: e36460072f
2014-06-09 16:25:49 -05:00
Steve Harris
67b4501d9b Merge branch 'master_14.2.2' (14.2.2-12) into omaha_14.2.2
Former-commit-id: 6e09bce335 [formerly 14370245fd] [formerly 6e09bce335 [formerly 14370245fd] [formerly bd98f04cde [formerly 65793ec4d12626b2d3365c5a0e8c3e229972b289]]]
Former-commit-id: bd98f04cde
Former-commit-id: 2445542f10 [formerly c11a44259e]
Former-commit-id: 2569e13053
2014-06-09 15:20:03 -05:00
Nate Jensen
bb716bceb2 Omaha #3211 fix data delivery modes
Change-Id: I06fede8fd63e0a71f5532e8124bf919faf62612e

Former-commit-id: 9666b22375 [formerly cd7e1a4665] [formerly 9666b22375 [formerly cd7e1a4665] [formerly 08c5c75035 [formerly 630f2fab4c3c37fd05eb9f92d14c11cf761d9477]]]
Former-commit-id: 08c5c75035
Former-commit-id: 9edf6426ce [formerly b2620a57be]
Former-commit-id: d7bd014bb9
2014-06-09 14:34:18 -05:00
Ben Steffensmeier
209a0b816c Omaha #3187 Add acars DAF factory.
Former-commit-id: 314ae86d14 [formerly 3774156385] [formerly 314ae86d14 [formerly 3774156385] [formerly 5348dfaa9f [formerly b53e4b8187a4acdcd4f23153f1e738114e0fb74a]]]
Former-commit-id: 5348dfaa9f
Former-commit-id: 8026eba730 [formerly 12a532040a]
Former-commit-id: b016e299d4
2014-06-09 13:18:21 -05:00
Nate Jensen
af0596f526 Merge "Omaha #2061 Allow acars to return data through point data requests." into omaha_14.4.1
Former-commit-id: cc68bc763f [formerly 9737e931d3] [formerly cc68bc763f [formerly 9737e931d3] [formerly 156e195bd3 [formerly d28ba701e1a074b2860e45bb2a9ca966a449dd8d]]]
Former-commit-id: 156e195bd3
Former-commit-id: 8939a733d2 [formerly f1a5cb1b33]
Former-commit-id: 2420169e61
2014-06-09 09:41:45 -05:00
Nate Jensen
4299caf439 Merge "Omaha #3226 added total lightning decoder" into omaha_14.4.1
Former-commit-id: a8022b8363 [formerly c8b6324240] [formerly a8022b8363 [formerly c8b6324240] [formerly 19bef8d080 [formerly ffa3e069c0beb5678ecb863b2950556d8c289ae1]]]
Former-commit-id: 19bef8d080
Former-commit-id: 87abeb25b9 [formerly 1d619bcf95]
Former-commit-id: 17e3c5f898
2014-06-09 09:38:50 -05:00
Ben Steffensmeier
82d4f42507 Omaha #3243 Update AWIPS2 references to remove deprecated lambert conformal creation.
Former-commit-id: f0be972b0a [formerly 69fb937150] [formerly f0be972b0a [formerly 69fb937150] [formerly 08c5348b84 [formerly f347369906eb28f58db75795d49b5513f60f9e37]]]
Former-commit-id: 08c5348b84
Former-commit-id: d9193dcfcf [formerly b6c6c5de97]
Former-commit-id: bf016fcdc0
2014-06-06 15:17:19 -05:00
Ben Steffensmeier
07e58539f0 Omaha #2061 Allow acars to return data through point data requests.
Former-commit-id: f0f1c0287f [formerly 7a66ea3e67] [formerly f0f1c0287f [formerly 7a66ea3e67] [formerly 4ea7f35d7a [formerly fad91d775de63379e0ee3ff47ffeb39730abfe11]]]
Former-commit-id: 4ea7f35d7a
Former-commit-id: a9c73d8450 [formerly 9fc00d65c6]
Former-commit-id: 2580a6570f
2014-06-06 15:14:53 -05:00
Brian Clements
8046cbc417 Omaha #3226 added total lightning decoder
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning

Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3

Former-commit-id: 2e445986e2 [formerly c278000764] [formerly 2e445986e2 [formerly c278000764] [formerly f39896b2d1 [formerly e2583481a77d08249030838ebd52eed6e54b2986]]]
Former-commit-id: f39896b2d1
Former-commit-id: 77b1f85fe1 [formerly b98a3494fe]
Former-commit-id: ca1b869647
2014-06-06 14:39:57 -05:00
Xuezhi.Wei
6911a1f357 ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2

Former-commit-id: 81ec03e291 [formerly bdbeec662c] [formerly 81ec03e291 [formerly bdbeec662c] [formerly 33b235a0a4 [formerly f7b5f3bbc71cc251e19f1764ee7756050895b7a3]]]
Former-commit-id: 33b235a0a4
Former-commit-id: e2f7548351 [formerly 445d58699a]
Former-commit-id: ae0a348358
2014-06-06 17:40:09 +00:00
Nate Jensen
10350a1337 Merge "Omaha #3232 Radar code improvements." into omaha_14.4.1
Former-commit-id: 5e9faea6e7 [formerly 3b324093ae] [formerly 5e9faea6e7 [formerly 3b324093ae] [formerly 920e53628b [formerly 22a5da1feff7e30ea0408f089305d95657befad2]]]
Former-commit-id: 920e53628b
Former-commit-id: f2d753fa64 [formerly c0f047b24f]
Former-commit-id: 24f7247805
2014-06-05 17:38:32 -05:00
Sean Webb
45d5701876 Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
Former-commit-id: e0f9eabb45 [formerly 016648ffaf] [formerly e0f9eabb45 [formerly 016648ffaf] [formerly cb43d21243 [formerly 5556e19903965bea22ca2f11b51fcc1c95cb07f8]]]
Former-commit-id: cb43d21243
Former-commit-id: b35f945bec [formerly c52983ab68]
Former-commit-id: 4e6fa39e5e
2014-06-05 15:03:11 -05:00
Ben Steffensmeier
dc5a927bb8 Omaha #3232 Radar code improvements.
Former-commit-id: 3eb6b79c56 [formerly 8587b9b43b] [formerly 3eb6b79c56 [formerly 8587b9b43b] [formerly 26325b57be [formerly 696f45d67c5e5b02183f97cfcc139db017f01848]]]
Former-commit-id: 26325b57be
Former-commit-id: 4f83edfa72 [formerly b8fe181c9a]
Former-commit-id: 9e97750df2
2014-06-05 14:53:25 -05:00
Fay.Liang
1ddb7a2b0b ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7

Former-commit-id: fa2cdbfac1 [formerly d1aa160aa7] [formerly fa2cdbfac1 [formerly d1aa160aa7] [formerly c5e6daa943 [formerly fc06896ae4d9adf0973522313f5e65df6ac67fa4]]]
Former-commit-id: c5e6daa943
Former-commit-id: 40eeef7fd1 [formerly 39efc11cb3]
Former-commit-id: ce1e19955e
2014-06-05 15:49:27 -04:00
Stephen Gilbert
7becf8d6da VLab Issue #3648 - Corrected NCEP additions for ESTOFS model
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b

Former-commit-id: 11cf39ce44 [formerly b7d93ed06d] [formerly 11cf39ce44 [formerly b7d93ed06d] [formerly d49482965e [formerly c681ba369a486f3ff3c7a324837a78e9c5594b4b]]]
Former-commit-id: d49482965e
Former-commit-id: 1a06e43797 [formerly 9ede855df5]
Former-commit-id: e1e95a36fe
2014-06-05 12:06:35 -04:00
Mike Duff
c2751cf532 Issue #3222 - Fix for SHEF posting times
Former-commit-id: 28a42f3f10 [formerly 8a5acd085d] [formerly 28a42f3f10 [formerly 8a5acd085d] [formerly f5f101d416 [formerly 3f1f9cf4fa6207edae642db5cffdc8284091f31a]]]
Former-commit-id: f5f101d416
Former-commit-id: 8e6a50e2ee [formerly 87d41ff302]
Former-commit-id: a615c41a57
2014-06-05 09:35:07 -05:00
Ron Anderson
bffcf0662f Omaha #3130 Fix thread safety issue in NetCDFFile.
Change-Id: I99999c827507a565e1980fe2b686cef4d848fe7d

Former-commit-id: bc7e037504 [formerly 47bdee2a58] [formerly bc7e037504 [formerly 47bdee2a58] [formerly 68a0c42242 [formerly 36f4c0f9b339dc91577cb231e2804d83f4f52706]]]
Former-commit-id: 68a0c42242
Former-commit-id: ded2e7d348 [formerly 3f4bdb7377]
Former-commit-id: fe1a2a8ebc
2014-06-04 16:31:32 -05:00
Ron Anderson
5eef76f45a Omaha #3071 Fix one more possible NPE
Change-Id: I23c3f47d354a2a5ee4576a6040e2012b3b39dfe6

Former-commit-id: 6cc9f69555 [formerly d772e2b49b] [formerly 6cc9f69555 [formerly d772e2b49b] [formerly fde392dcd1 [formerly 855c5410fc4bf2e33f6dcd560f0c8441199ad0ad]]]
Former-commit-id: fde392dcd1
Former-commit-id: 1cb49c6d8d [formerly d1f5016eb9]
Former-commit-id: 94789ea5cf
2014-06-04 16:26:25 -05:00
Greg Armendariz
86e574ea33 Omaha #3227 - Add memory check to capture script
Change-Id: Icce56d22be3c785ccfe41903b01eabdbe49c5475

Former-commit-id: 59f25a8790 [formerly 5b1f81551c] [formerly 59f25a8790 [formerly 5b1f81551c] [formerly fc88788547 [formerly 2d72889bf873c08cef82b2dd01f91e14d04ddc62]]]
Former-commit-id: fc88788547
Former-commit-id: 8296281614 [formerly 87c4971f59]
Former-commit-id: 92d41cefe3
2014-06-04 10:00:59 -05:00
Brian.Dyke
cdbcdb6cbd Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: feb26ee9b7 [formerly 61b206be0b] [formerly feb26ee9b7 [formerly 61b206be0b] [formerly 3919c9ec2f [formerly 36fa86071fa492bd1d135b3ded6cde54d0567474]]]
Former-commit-id: 3919c9ec2f
Former-commit-id: 8f6e365ece [formerly 244467210c]
Former-commit-id: 75c6886f61
2014-06-04 07:46:16 -04:00
Brian.Dyke
ed90689b97 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 896aeeb2dd [formerly 2fb1e52728] [formerly 896aeeb2dd [formerly 2fb1e52728] [formerly 329393d172 [formerly 298cc5124ee8a8b12db45ae2d2c9505f0ae99857]]]
Former-commit-id: 329393d172
Former-commit-id: 24cb72d0b3 [formerly 7ef2c8d018]
Former-commit-id: f46f6c2953
2014-06-04 07:41:40 -04:00
Brian.Dyke
db5e13d110 Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 2db2536d02 [formerly 6437ee2322] [formerly 2db2536d02 [formerly 6437ee2322] [formerly 696bf39f26 [formerly 785b4a8b95ad78d84b6e68f4d3917c7142d4a3ce]]]
Former-commit-id: 696bf39f26
Former-commit-id: f8dc753d82 [formerly 444630b0ba]
Former-commit-id: de337823ba
2014-06-04 07:41:28 -04:00
Kenneth Sperow
ca67a59e23 Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml

Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8

Former-commit-id: a59743ebe0 [formerly c302ef8967] [formerly a59743ebe0 [formerly c302ef8967] [formerly f2a738cc25 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]]
Former-commit-id: f2a738cc25
Former-commit-id: 1ba5f0a3c4 [formerly ca913b6159]
Former-commit-id: 3e94502542
2014-06-03 20:55:29 -07:00
brian.dyke
65f4a41200 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 789482b0e3 [formerly 79f866fb17] [formerly 789482b0e3 [formerly 79f866fb17] [formerly b3d95ca18d [formerly 2d4751c000176447d28b284337fb23a60cb19cd1]]]
Former-commit-id: b3d95ca18d
Former-commit-id: 05dfb0b2a5 [formerly 76cbdf64ff]
Former-commit-id: 21721fd935
2014-06-03 16:14:16 -04:00
Ron Anderson
3302fa4262 Omaha #3071 Fix error in IFPGridDatabase found in code review
Change-Id: I7bdab6085d49f0ed3667cc4d27dc58aae24d0bcf

Former-commit-id: 78b8fe9f92 [formerly cf44e1835a] [formerly 78b8fe9f92 [formerly cf44e1835a] [formerly 03b44f91d0 [formerly 97dd32f3ee5393e419ca7794eb2f564a4941494e]]]
Former-commit-id: 03b44f91d0
Former-commit-id: f20370609d [formerly dec1fa7dd4]
Former-commit-id: 05ccbd5461
2014-06-03 14:15:51 -05:00
Nate Jensen
f7248a2ad1 Merge "Omaha #3226 moved ost lightning code to new plugin" into omaha_14.4.1
Former-commit-id: abb63ad32d [formerly c3b8358eb6] [formerly abb63ad32d [formerly c3b8358eb6] [formerly 364e6ea94a [formerly 87eef5bc338290f252879801b86e6df64b7c6f1c]]]
Former-commit-id: 364e6ea94a
Former-commit-id: ec6d669c18 [formerly a54e6006da]
Former-commit-id: 9e7a9c6d91
2014-06-03 08:09:16 -05:00
Ron Anderson
b98936356f Omaha #3052 Improved TopoQuery error handling to throw exceptions with useful error messages.
Change-Id: Ic181682611801ea244b986e8a2ce1400c4dc15d1

Former-commit-id: bd50ae9854 [formerly 3f169399b8] [formerly bd50ae9854 [formerly 3f169399b8] [formerly 304364e356 [formerly 0d42d4fdc56122c3df912c93e5e09b0ab28c1b37]]]
Former-commit-id: 304364e356
Former-commit-id: 060b0221fa [formerly 3ff441f9da]
Former-commit-id: 7171bc6f0a
2014-06-02 17:14:18 -05:00