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 |
|
Brian Clements
|
6a7d8a4f36
|
Omaha #3226 moved ost lightning code to new plugin
fixed NPE when missing encryption config
Change-Id: I8ef6004f44b686918220e7729a499e456787a834
Former-commit-id: 0f029c3015 [formerly 664d9282c3] [formerly 0f029c3015 [formerly 664d9282c3] [formerly 6b09d9b3c5 [formerly 5421b666fc52e849e4ad5b39e2328a5c90a42408]]]
Former-commit-id: 6b09d9b3c5
Former-commit-id: a4bebe81df [formerly 7ff77c5960]
Former-commit-id: 2ef88ef15d
|
2014-06-02 15:33:41 -05:00 |
|
Nate Jensen
|
0a9b66d713
|
Merge "Omaha #3211 fix edex startup issues" into omaha_14.4.1
Former-commit-id: 21468f0f2d [formerly ff799b8044] [formerly 21468f0f2d [formerly ff799b8044] [formerly 9269a938ce [formerly 367289573446fcb10678af38ce36ab8797889a6d]]]
Former-commit-id: 9269a938ce
Former-commit-id: 2e6bd78c02 [formerly 71981cb7ae]
Former-commit-id: 90ade0bba0
|
2014-06-02 14:43:34 -05:00 |
|
cmadmin
|
06e9bf0c1c
|
Merge "Omaha #3132 Fix ohd merge issues." into omaha_14.4.1
Former-commit-id: 05dac7601b [formerly e5ffd0f40c] [formerly 05dac7601b [formerly e5ffd0f40c] [formerly 75ee567f85 [formerly b57f019ff57da1193823bcba75698077f7c7e6b4]]]
Former-commit-id: 75ee567f85
Former-commit-id: abf7fa2bdc [formerly 447e46f682]
Former-commit-id: fc269f33dd
|
2014-06-02 13:59:15 -05:00 |
|
Ron Anderson
|
13aa4a3a53
|
Omaha #3132 Fix ohd merge issues.
Change-Id: I9cd7f10b55d4e599152827e4f5a793be11ce37fc
Former-commit-id: 8ef6180ac2 [formerly 0c569e6249] [formerly 8ef6180ac2 [formerly 0c569e6249] [formerly c294a06b72 [formerly 5b3b83fe73b905c1d3e3743baf632e1364475eaf]]]
Former-commit-id: c294a06b72
Former-commit-id: 87ab046a05 [formerly 9343611362]
Former-commit-id: b713ab7c29
|
2014-06-02 13:40:26 -05:00 |
|
Ron Anderson
|
beed49c255
|
Merge "Omaha #3071 Fix several errors identified by the log tool" into omaha_14.4.1
Former-commit-id: 0d44ffc6dc [formerly f5a89ce811] [formerly 0d44ffc6dc [formerly f5a89ce811] [formerly d301a71c9a [formerly 8c710088b9d9539c240de61b7d58963d3b83326e]]]
Former-commit-id: d301a71c9a
Former-commit-id: 56046abf71 [formerly d36b37ade6]
Former-commit-id: 2d9e212cc6
|
2014-06-02 13:37:41 -05:00 |
|
Nate Jensen
|
3f9512f549
|
Omaha #3211 fix edex startup issues
Change-Id: I634ec432e7136e191706d4b8b7063d845dd9fb7c
Former-commit-id: 6e85b66b1b [formerly f973ce1bbe] [formerly 6e85b66b1b [formerly f973ce1bbe] [formerly cf5a1d16c9 [formerly dd5cabbc335662e0583b76a5bef6bfdf28569735]]]
Former-commit-id: cf5a1d16c9
Former-commit-id: 4cf6224645 [formerly 25ec0697ae]
Former-commit-id: 25d09c4183
|
2014-06-02 12:39:34 -05:00 |
|
Steve Harris
|
346c44507b
|
Omaha #3132 - ohd merge core files should go in ufcore
Former-commit-id: ff567e9e38 [formerly 69d0ad089e] [formerly ff567e9e38 [formerly 69d0ad089e] [formerly 97523137b9 [formerly 6e27d0eb0461e3c3d64b04f8179f946d973251f1]]]
Former-commit-id: 97523137b9
Former-commit-id: e008b73269 [formerly bf3d13609b]
Former-commit-id: 4620d946ee
|
2014-06-02 12:11:00 -05:00 |
|
Ron Anderson
|
3ae7d21833
|
Omaha #3071 Fix several errors identified by the log tool
Change-Id: I98aa1101fa796bd4ad93d2b8556248bbd13219e4
Former-commit-id: 8daa3bac9c [formerly 9ebbc261b1] [formerly 8daa3bac9c [formerly 9ebbc261b1] [formerly ca0946b5f8 [formerly ca6a36be221da70cd766c6e844e2852bd67f69c3]]]
Former-commit-id: ca0946b5f8
Former-commit-id: e28633a781 [formerly b45048f5bf]
Former-commit-id: 674baaeabc
|
2014-06-02 12:08:35 -05:00 |
|
Steve Harris
|
7eabeb7ad6
|
Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
edexOsgi/build.edex/edex/common.properties
edexOsgi/build.edex/esb/conf/modes.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so
Former-commit-id: 647cd97e29 [formerly 7fec0d039c] [formerly 647cd97e29 [formerly 7fec0d039c] [formerly 455eb8b39d [formerly 45250149681f057cf168f4d3cb27276279f62c05]]]
Former-commit-id: 455eb8b39d
Former-commit-id: 373c816e6a [formerly ec743199f1]
Former-commit-id: cbceb4ea62
|
2014-06-02 11:21:46 -05:00 |
|
Steve Harris
|
9aa3a5a035
|
Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1
Former-commit-id: 4e26e224fd [formerly 65a3390a6a] [formerly 4e26e224fd [formerly 65a3390a6a] [formerly 3bde6b3e41 [formerly ee696cb24c8d72f0562126a131824e958b88f090]]]
Former-commit-id: 3bde6b3e41
Former-commit-id: 0edb16b05e [formerly c3deafc840]
Former-commit-id: 46b7122d56
|
2014-06-02 07:31:14 -05:00 |
|
Brian.Dyke
|
106a921a4c
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: de2df4cb6f [formerly b8ba378862] [formerly de2df4cb6f [formerly b8ba378862] [formerly c6244e1950 [formerly dec7b6fa091cab098b89a51551fa46b9f28b959b]]]
Former-commit-id: c6244e1950
Former-commit-id: 30f72a9337 [formerly 6edbd149a5]
Former-commit-id: 45deec5df6
|
2014-06-02 07:01:37 -04:00 |
|
Brian.Dyke
|
9351315fd6
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: a0a879be7d [formerly a8737e18f0] [formerly a0a879be7d [formerly a8737e18f0] [formerly 3f1e12effc [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]
Former-commit-id: 3f1e12effc
Former-commit-id: 3961c75ecd [formerly 66aacd6578]
Former-commit-id: a23d371522
|
2014-05-30 10:46:25 -04:00 |
|