Ron Anderson
|
9f08f30f73
|
Merge "Omaha #3243 Update AWIPS2 references to remove deprecated lambert conformal creation." into omaha_14.4.1
Former-commit-id: 7f9f516455 [formerly 5925b63308] [formerly d8f063c6f8] [formerly b9caf16088 [formerly d8f063c6f8 [formerly a8c8602f651e082d6eeeab1973d98546429b8ceb]]]
Former-commit-id: b9caf16088
Former-commit-id: ebc70137b81ffb60ed4b0761c42857c31b3718aa [formerly 746272ac9a]
Former-commit-id: ea15d8b471
|
2014-06-11 07:59:30 -05:00 |
|
Nate Jensen
|
090e92c5a9
|
Omaha #3266 remove unused attributes and elements from baseline menu xml
files
Change-Id: I1a1f75f2b2a314679487ddf719f4f0055bdf8d01
Former-commit-id: 7783919a76 [formerly 23f3a15f31] [formerly 205e491d71] [formerly 955e115c00 [formerly 205e491d71 [formerly 797504a970ec39c4fd56c9e0d51b292acfceea1b]]]
Former-commit-id: 955e115c00
Former-commit-id: e7972d10e8e9f8d2d57b2115e4f5431b97c32a6a [formerly f634182937]
Former-commit-id: f9d4da37b1
|
2014-06-10 18:30:14 -05:00 |
|
Nate Jensen
|
997128e6c5
|
Merge "Omaha #2061 Delete PlotResource, rename PlotResource2." into omaha_14.4.1
Former-commit-id: 029d18dd12 [formerly be169a7f63] [formerly 6890ee0920] [formerly 10207907d8 [formerly 6890ee0920 [formerly b0903898a40916383f88b920e87dfc072d9cafa9]]]
Former-commit-id: 10207907d8
Former-commit-id: bc9e5521a3d6cf145c8cd6387d58c9b66089aa58 [formerly 33b22ece81]
Former-commit-id: 789d9be951
|
2014-06-10 17:14:53 -05:00 |
|
Nate Jensen
|
65d644a24d
|
Merge "Omaha #3263 Synchronize dataTimes of storm track resources." into omaha_14.4.1
Former-commit-id: 173d32e313 [formerly f687af2d09] [formerly 624f9966d2] [formerly ac79df87cc [formerly 624f9966d2 [formerly 7f80eb9b3daf725220e74f8be40fcdf704158341]]]
Former-commit-id: ac79df87cc
Former-commit-id: 4cfbe04911e28ddde4d6d641124aa8486f215d0e [formerly 095c9fc28f]
Former-commit-id: a5f7e7b3f5
|
2014-06-10 16:56:36 -05:00 |
|
Ben Steffensmeier
|
814cabbcfc
|
Omaha #3263 Synchronize dataTimes of storm track resources.
Former-commit-id: e7128150f9 [formerly 8783e9e23c] [formerly eff1921f70] [formerly cad15768cc [formerly eff1921f70 [formerly d0a3a73a3a2375a49dc3e224a1c13956530d3351]]]
Former-commit-id: cad15768cc
Former-commit-id: 0968abe7b80aa03d6d67b8c88ad9529a151531f3 [formerly b02383f878]
Former-commit-id: e4ac81c0e9
|
2014-06-10 16:34:44 -05:00 |
|
dmsys
|
a8e144476a
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: ca9a4ac6fb [formerly fc77941b88] [formerly b7cfb9e752] [formerly 1f0a6112c7 [formerly b7cfb9e752 [formerly 161ffe72d115c7846697afa8be559d2f5fd199da]]]
Former-commit-id: 1f0a6112c7
Former-commit-id: 17ca0f25d2213832508bb0d62b7865a4e3af8ce7 [formerly c377233491]
Former-commit-id: f85d84246f
|
2014-06-10 17:17:26 -04:00 |
|
Ben Steffensmeier
|
ec7c42dd48
|
Omaha #2061 Delete PlotResource, rename PlotResource2.
Former-commit-id: 1191aa9adf [formerly bcc7243358] [formerly 1e37d669d8] [formerly a98872cb89 [formerly 1e37d669d8 [formerly b569c7c3e175ed1519576aea63048c3f675d3875]]]
Former-commit-id: a98872cb89
Former-commit-id: 12e70d14ff5c3857021a22734b1090ee010e2a95 [formerly d40c6fd625]
Former-commit-id: bbcec7c004
|
2014-06-10 15:59:15 -05:00 |
|
Ben Steffensmeier
|
054332bba4
|
Issue #2661 Fix vector derived parameter.
Former-commit-id: 6f21122f93 [formerly 1f270a6059] [formerly cd60dc028a] [formerly 0a66c47341 [formerly cd60dc028a [formerly 238043b8c4286e398176d4d6c78e585e33faa5da]]]
Former-commit-id: 0a66c47341
Former-commit-id: ffde9f4f15837ec13b10838ca62ccdef3678f11a [formerly 799f7baacc]
Former-commit-id: 07731bab04
|
2014-06-10 15:44:33 -05:00 |
|
Ben Steffensmeier
|
a8337629fb
|
Omaha #3232 Add DynamicSerialize to radar hail prob packet.
Former-commit-id: 1599e7df77 [formerly aa0766584e] [formerly 4240ad5c1b] [formerly 79cb8ebae8 [formerly 4240ad5c1b [formerly 713371e38842d3f8fd26f4df83d4b201611cd002]]]
Former-commit-id: 79cb8ebae8
Former-commit-id: 3b2197a73fc71bf68652ff71a6d21b6a48a9f10e [formerly 5002a8a85e]
Former-commit-id: b480b2cec5
|
2014-06-10 15:39:25 -05:00 |
|
Nate Jensen
|
09cba64e6c
|
Merge "Omaha #3226 encryption support for total lightning" into omaha_14.4.1
Former-commit-id: cab065ff19 [formerly 96153d789c] [formerly 9b73096d46] [formerly 5dae467620 [formerly 9b73096d46 [formerly dd8b7377139e41168841b97a9cace0aca1c9da23]]]
Former-commit-id: 5dae467620
Former-commit-id: 8a8dad75221378b4cab9f3b15d2d2fe8b70fafbc [formerly 680d230a2b]
Former-commit-id: e82f0bc3f0
|
2014-06-10 12:00:58 -05:00 |
|
Nate Jensen
|
9232f0cd5e
|
Merge "Omaha #3027 fix logservice's build script and reconnect logic if error occurs" into omaha_14.4.1
Former-commit-id: 534fa5409b [formerly 221b411022] [formerly cef403d0ac] [formerly 77b368f72d [formerly cef403d0ac [formerly 2f787e330e6e93f7d77aebeec968191382d9e062]]]
Former-commit-id: 77b368f72d
Former-commit-id: d319369dea206d028d7979432356f78f8dec531b [formerly 47cb6acaa4]
Former-commit-id: 129ec2bf93
|
2014-06-10 10:45:26 -05:00 |
|
Nate Jensen
|
fba24f6210
|
Merge "Omaha #3266 remove redbook menu util's use of dataURIs" into omaha_14.4.1
Former-commit-id: fe224216c3 [formerly f4ff7743a6] [formerly 156744e43d] [formerly 2345e3ca97 [formerly 156744e43d [formerly 13a194bbbe01dce46d4fceec127e42c8a106a096]]]
Former-commit-id: 2345e3ca97
Former-commit-id: 2127cb31c520f622a4fa15b8c5070f03e44c303c [formerly 67ffe1a721]
Former-commit-id: b3aeb45f5b
|
2014-06-10 10:45:04 -05:00 |
|
Brian Clements
|
ebea790a96
|
Omaha #3226 encryption support for total lightning
Change-Id: I87af2d986830681d258c065304e3ebfb2d2af8db
Former-commit-id: 7750e33dc6 [formerly ae54caa806] [formerly f511f2fdb3a952d931ae2e5781750ab326f8cc49 [formerly 93efa905a3]] [formerly d4c55244a1 [formerly 93efa905a3 [formerly fe199cb32b3fe33ac48f039888bd43d4fedd9820]]]
Former-commit-id: d4c55244a1
Former-commit-id: 6c28204bc6a91f25664f79207c6115d3721f6fbb [formerly 6ed7f5ce29]
Former-commit-id: 30cd1b3413
|
2014-06-10 08:46:41 -05:00 |
|
Nate Jensen
|
7130cd5864
|
Omaha #3027 fix logservice's build script and reconnect logic if error
occurs
Change-Id: Ic389fe690c832505ab044996a2d9d7d16e535616
Former-commit-id: 217d088e67 [formerly 3583bda1f0] [formerly 5edfea4582] [formerly a9d6a75a62 [formerly 5edfea4582 [formerly bba5e64230d90d5c36bb9a4498db8c9eff945157]]]
Former-commit-id: a9d6a75a62
Former-commit-id: d39e2290078ea3499e6cd95073504836218944a7 [formerly 4011b49c8f]
Former-commit-id: aa86a7537b
|
2014-06-09 16:32:48 -05:00 |
|
Nate Jensen
|
1200cc84f6
|
Omaha #3266 remove redbook menu util's use of dataURIs
Change-Id: I2181c18e1b934538e463679bc5bdcb4bb7e411a3
Former-commit-id: 30d4f29dd5 [formerly 771acd01b1] [formerly c401bb5992] [formerly 5267f93292 [formerly c401bb5992 [formerly 482349158b2275210fb366bc67eace6a3f3fc04e]]]
Former-commit-id: 5267f93292
Former-commit-id: ef6329647d47958113f47d325edad9f3478f5e8d [formerly d57e6d2503]
Former-commit-id: 21c5f5fb0a
|
2014-06-09 16:25:49 -05:00 |
|
Bryan Kowal
|
4a8bafd06f
|
Omaha #3189 - ensure the PostgreSQL libpq libraries are included in the hydroapps native directory
Former-commit-id: f716c82bce [formerly 1920bf461d] [formerly 03d2a8ab7e] [formerly 8896dc8a75 [formerly 03d2a8ab7e [formerly 1da5e7cb5f6d8a6b8e915a8ecb238a0825991afe]]]
Former-commit-id: 8896dc8a75
Former-commit-id: 72d1abfe8fc565c093665727697687b862180af2 [formerly 22d4631b55]
Former-commit-id: 692673ade3
|
2014-06-09 16:20:01 -05:00 |
|
Nate Jensen
|
a5a35f9f42
|
Omaha #3211 fix data delivery modes
Change-Id: I06fede8fd63e0a71f5532e8124bf919faf62612e
Former-commit-id: 172b60415c [formerly 9666b22375] [formerly 74ba20193cbc32227103d183c6a8566ab4413a88 [formerly cd7e1a4665]] [formerly 08c5c75035 [formerly cd7e1a4665 [formerly 630f2fab4c3c37fd05eb9f92d14c11cf761d9477]]]
Former-commit-id: 08c5c75035
Former-commit-id: 6dae8425eba143bc693975dd128dcc0b25044877 [formerly b2620a57be]
Former-commit-id: 9edf6426ce
|
2014-06-09 14:34:18 -05:00 |
|
Ben Steffensmeier
|
e60657b6c3
|
Omaha #3187 Add acars DAF factory.
Former-commit-id: 6abd4406e2 [formerly 314ae86d14] [formerly 3774156385] [formerly 5348dfaa9f [formerly 3774156385 [formerly b53e4b8187a4acdcd4f23153f1e738114e0fb74a]]]
Former-commit-id: 5348dfaa9f
Former-commit-id: ad7e984d6f91a625a24c5980efe7221e8a25cfc5 [formerly 12a532040a]
Former-commit-id: 8026eba730
|
2014-06-09 13:18:21 -05:00 |
|
Nate Jensen
|
3b6aa3b8a7
|
Merge "Omaha #2061 Allow acars to return data through point data requests." into omaha_14.4.1
Former-commit-id: c9f5ee044b [formerly cc68bc763f] [formerly 9737e931d3] [formerly 156e195bd3 [formerly 9737e931d3 [formerly d28ba701e1a074b2860e45bb2a9ca966a449dd8d]]]
Former-commit-id: 156e195bd3
Former-commit-id: c8cb7dca2dcfe1b652b4a43d8c3b5539f711d46a [formerly f1a5cb1b33]
Former-commit-id: 8939a733d2
|
2014-06-09 09:41:45 -05:00 |
|
Nate Jensen
|
71a091b896
|
Merge "Omaha #3226 added total lightning decoder" into omaha_14.4.1
Former-commit-id: 72890cee17 [formerly a8022b8363] [formerly c8b6324240] [formerly 19bef8d080 [formerly c8b6324240 [formerly ffa3e069c0beb5678ecb863b2950556d8c289ae1]]]
Former-commit-id: 19bef8d080
Former-commit-id: 877785bfca1f4a6501e488fc91209f596d9b6209 [formerly 1d619bcf95]
Former-commit-id: 87abeb25b9
|
2014-06-09 09:38:50 -05:00 |
|
Ben Steffensmeier
|
823dba4018
|
Omaha #3243 Update AWIPS2 references to remove deprecated lambert conformal creation.
Former-commit-id: 267212cea6 [formerly f0be972b0a] [formerly 9e9ae3526d01bf80bb9e4f4acbaf743097216dd4 [formerly 69fb937150]] [formerly 08c5348b84 [formerly 69fb937150 [formerly f347369906eb28f58db75795d49b5513f60f9e37]]]
Former-commit-id: 08c5348b84
Former-commit-id: 51c57f8f1134625ba14de21ed51bd3fb98a60f5e [formerly b6c6c5de97]
Former-commit-id: d9193dcfcf
|
2014-06-06 15:17:19 -05:00 |
|
Ben Steffensmeier
|
024dea166c
|
Omaha #2061 Allow acars to return data through point data requests.
Former-commit-id: 734c6ac6ac [formerly f0f1c0287f] [formerly 7a66ea3e67] [formerly 4ea7f35d7a [formerly 7a66ea3e67 [formerly fad91d775de63379e0ee3ff47ffeb39730abfe11]]]
Former-commit-id: 4ea7f35d7a
Former-commit-id: 8760adaa5ebcea4e243daa19b2b1856c0b749ba1 [formerly 9fc00d65c6]
Former-commit-id: a9c73d8450
|
2014-06-06 15:14:53 -05:00 |
|
Brian Clements
|
04bd60be1d
|
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: eb782b8201 [formerly 2e445986e2] [formerly c278000764] [formerly f39896b2d1 [formerly c278000764 [formerly e2583481a77d08249030838ebd52eed6e54b2986]]]
Former-commit-id: f39896b2d1
Former-commit-id: 7f4d763d46a3bdf042a5574c4aafc88355d20fd6 [formerly b98a3494fe]
Former-commit-id: 77b1f85fe1
|
2014-06-06 14:39:57 -05:00 |
|
Nate Jensen
|
16461f7204
|
Merge "Omaha #3232 Radar code improvements." into omaha_14.4.1
Former-commit-id: 4dbf0be26c [formerly 5e9faea6e7] [formerly 3b324093ae] [formerly 920e53628b [formerly 3b324093ae [formerly 22a5da1feff7e30ea0408f089305d95657befad2]]]
Former-commit-id: 920e53628b
Former-commit-id: 3359ee9c8061b5996314083928ff3cee94ee634a [formerly c0f047b24f]
Former-commit-id: f2d753fa64
|
2014-06-05 17:38:32 -05:00 |
|
Ben Steffensmeier
|
cdd8eb2d9e
|
Omaha #3232 Radar code improvements.
Former-commit-id: d2587a7d57 [formerly 3eb6b79c56] [formerly 8587b9b43b] [formerly 26325b57be [formerly 8587b9b43b [formerly 696f45d67c5e5b02183f97cfcc139db017f01848]]]
Former-commit-id: 26325b57be
Former-commit-id: a96d770a2e60482e10653300e2065d1100acb73d [formerly b8fe181c9a]
Former-commit-id: 4f83edfa72
|
2014-06-05 14:53:25 -05:00 |
|
Chip Gobs
|
1371c8a87c
|
VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse.
Change-Id: I096cc2e9c60a5aa26662e5fccc6692c3ce4f875d
Former-commit-id: 12f78bef75 [formerly a5c4402f34] [formerly 83ac596f9e] [formerly 036d1c4d31 [formerly 83ac596f9e [formerly 6944361d04e7462f768bb74f00780dc8b8a51225]]]
Former-commit-id: 036d1c4d31
Former-commit-id: bb1f30981bdeb43668927256d57f49f733780101 [formerly 6fd88e5422]
Former-commit-id: 8edb6c28d8
|
2014-06-05 13:37:02 -04:00 |
|
Stephen Gilbert
|
23738d2966
|
VLab Issue #3648 - Corrected NCEP additions for ESTOFS model
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b
Former-commit-id: bb2323b792 [formerly 11cf39ce44] [formerly b7d93ed06d] [formerly d49482965e [formerly b7d93ed06d [formerly c681ba369a486f3ff3c7a324837a78e9c5594b4b]]]
Former-commit-id: d49482965e
Former-commit-id: 77a6bb7bb13ed1988a7199e241f15dfce9ad4d3f [formerly 9ede855df5]
Former-commit-id: 1a06e43797
|
2014-06-05 12:06:35 -04:00 |
|
Nate Jensen
|
db2b6d9854
|
Merge "Omaha #3098 Changes to also look at 'Wx' occasional (TEMPO) data." into omaha_14.4.1
Former-commit-id: 6106d2e55e [formerly cff10fda0d] [formerly 1e0c34575d] [formerly a8e8e6bca8 [formerly 1e0c34575d [formerly 0e860418676f9f175d22225cc50a0ad23c0db236]]]
Former-commit-id: a8e8e6bca8
Former-commit-id: a40bf1cdc4f070b424c9ff39fd6e601a5fdf0f50 [formerly dfd2f3d071]
Former-commit-id: 0aeb4ca76c
|
2014-06-04 17:16:51 -05:00 |
|
Ron Anderson
|
2c8bffcac1
|
Omaha #3130 Fix thread safety issue in NetCDFFile.
Change-Id: I99999c827507a565e1980fe2b686cef4d848fe7d
Former-commit-id: 0f4df01d71 [formerly bc7e037504] [formerly 47bdee2a58] [formerly 68a0c42242 [formerly 47bdee2a58 [formerly 36f4c0f9b339dc91577cb231e2804d83f4f52706]]]
Former-commit-id: 68a0c42242
Former-commit-id: 94d5a0b7dd70cb202ca635445f47234f7cd62f15 [formerly 3f4bdb7377]
Former-commit-id: ded2e7d348
|
2014-06-04 16:31:32 -05:00 |
|
Ron Anderson
|
71e7015e91
|
Omaha #3071 Fix one more possible NPE
Change-Id: I23c3f47d354a2a5ee4576a6040e2012b3b39dfe6
Former-commit-id: d6611b5e32 [formerly 6cc9f69555] [formerly d772e2b49b] [formerly fde392dcd1 [formerly d772e2b49b [formerly 855c5410fc4bf2e33f6dcd560f0c8441199ad0ad]]]
Former-commit-id: fde392dcd1
Former-commit-id: 0fe4af120ab8fbf9cd0a12c4261460cc0bb2dff0 [formerly d1f5016eb9]
Former-commit-id: 1cb49c6d8d
|
2014-06-04 16:26:25 -05:00 |
|
Brian.Dyke
|
60f06d1e18
|
ASM #557 - Removed rh6 dependency from wxgtk rpm requirements...modified spec file
Former-commit-id: 67cef121bf [formerly de6a06bc8c] [formerly d708eeb7d8] [formerly 7db87d6ccb [formerly d708eeb7d8 [formerly f671db68bfab4b9c17eb25050468e5b6306e6359]]]
Former-commit-id: 7db87d6ccb
Former-commit-id: 5941a66242df6eb16b8846d1f66fcfb8133681e4 [formerly bce3dc1bef]
Former-commit-id: c00bc1d654
|
2014-06-04 11:52:00 -04:00 |
|
Greg Armendariz
|
17e4c60f53
|
Omaha #3227 - Add memory check to capture script
Change-Id: Icce56d22be3c785ccfe41903b01eabdbe49c5475
Former-commit-id: f8c2f848a0 [formerly 59f25a8790] [formerly 5b1f81551c] [formerly fc88788547 [formerly 5b1f81551c [formerly 2d72889bf873c08cef82b2dd01f91e14d04ddc62]]]
Former-commit-id: fc88788547
Former-commit-id: e79cfc7771efad8f1c69c82376c3e9619fc61cde [formerly 87c4971f59]
Former-commit-id: 8296281614
|
2014-06-04 10:00:59 -05:00 |
|
Roger Ferrel
|
48dd32b752
|
Omaha #3098 Changes to also look at 'Wx' occasional (TEMPO) data.
Change-Id: Ide97fbfd93bf06a6d708bf6fbd74349000ba2ed5
Former-commit-id: cb5070f384 [formerly 7510cc23af] [formerly e1c011b157] [formerly 10e7a33f08 [formerly e1c011b157 [formerly 3e976b7ed5cf46687bbb76073e53f35ffc2c2812]]]
Former-commit-id: 10e7a33f08
Former-commit-id: e5bd21828e3c3092ef9dcb90f6991be60f99b48d [formerly aa085d9e59]
Former-commit-id: e799ce4c59
|
2014-06-04 08:14:06 -05:00 |
|
Brian.Dyke
|
7d8dd856bd
|
Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: a91c426ee7 [formerly feb26ee9b7] [formerly 61b206be0b] [formerly 3919c9ec2f [formerly 61b206be0b [formerly 36fa86071fa492bd1d135b3ded6cde54d0567474]]]
Former-commit-id: 3919c9ec2f
Former-commit-id: f5c80b02fc2a80a424af9d583f9c067a6dab9c12 [formerly 244467210c]
Former-commit-id: 8f6e365ece
|
2014-06-04 07:46:16 -04:00 |
|
Brian.Dyke
|
1dbe31af34
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: cfd6da7fd4 [formerly 896aeeb2dd] [formerly 2fb1e52728] [formerly 329393d172 [formerly 2fb1e52728 [formerly 298cc5124ee8a8b12db45ae2d2c9505f0ae99857]]]
Former-commit-id: 329393d172
Former-commit-id: 8f9bada0788cbf9b09176afa03bea90844e9518e [formerly 7ef2c8d018]
Former-commit-id: 24cb72d0b3
|
2014-06-04 07:41:40 -04:00 |
|
Brian.Dyke
|
2163462027
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 942dd3ab92 [formerly 2db2536d02] [formerly 6437ee2322] [formerly 696bf39f26 [formerly 6437ee2322 [formerly 785b4a8b95ad78d84b6e68f4d3917c7142d4a3ce]]]
Former-commit-id: 696bf39f26
Former-commit-id: 651c507817908c12ac348cadd2a6bde56364233f [formerly 444630b0ba]
Former-commit-id: f8dc753d82
|
2014-06-04 07:41:28 -04:00 |
|
Kenneth Sperow
|
be5c7616f5
|
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: 764ffeb440 [formerly a59743ebe0] [formerly c302ef8967] [formerly f2a738cc25 [formerly c302ef8967 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]]
Former-commit-id: f2a738cc25
Former-commit-id: f37bc3930eb01b1551e48a86cb29ce5ebd4ca434 [formerly ca913b6159]
Former-commit-id: 1ba5f0a3c4
|
2014-06-03 20:55:29 -07:00 |
|
Nate Jensen
|
c60189dfd9
|
Merge "Omaha #3163 Fix collaboration string differencing" into omaha_14.4.1
Former-commit-id: 0e015bd524 [formerly e12a0ef8df] [formerly fbad2f72d5] [formerly f75a57ac23 [formerly fbad2f72d5 [formerly 4535b6ce392515daa465f395fb002b9c4116c111]]]
Former-commit-id: f75a57ac23
Former-commit-id: 2e7a2b13be3b5bf7e093f51ec9a052ff84bc8de3 [formerly eaa8958ce2]
Former-commit-id: 296b381544
|
2014-06-03 16:17:34 -05:00 |
|
brian.dyke
|
cabd43daf1
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 17eb7729c7 [formerly 789482b0e3] [formerly 79f866fb17] [formerly b3d95ca18d [formerly 79f866fb17 [formerly 2d4751c000176447d28b284337fb23a60cb19cd1]]]
Former-commit-id: b3d95ca18d
Former-commit-id: 7ad9171a6cdb412defa9850b769ed5db070cb4ae [formerly 76cbdf64ff]
Former-commit-id: 05dfb0b2a5
|
2014-06-03 16:14:16 -04:00 |
|
Ron Anderson
|
0f63304363
|
Omaha #3071 Fix error in IFPGridDatabase found in code review
Change-Id: I7bdab6085d49f0ed3667cc4d27dc58aae24d0bcf
Former-commit-id: f64b50eba2 [formerly 78b8fe9f92] [formerly 4034db538546bad52123fef76e64dce651c0997c [formerly cf44e1835a]] [formerly 03b44f91d0 [formerly cf44e1835a [formerly 97dd32f3ee5393e419ca7794eb2f564a4941494e]]]
Former-commit-id: 03b44f91d0
Former-commit-id: 8d8c4f644396a7779f20a8367e5ca4aaddf525d3 [formerly dec1fa7dd4]
Former-commit-id: f20370609d
|
2014-06-03 14:15:51 -05:00 |
|
Ben Steffensmeier
|
3ebd687ef6
|
Omaha #3163 Fix collaboration string differencing
Former-commit-id: 6e70040ee2 [formerly 2c534e177e] [formerly ca2210b3e7] [formerly 310e6562e6 [formerly ca2210b3e7 [formerly e6f30c822de26bafae339a8871c4ba98100e6d1a]]]
Former-commit-id: 310e6562e6
Former-commit-id: 3ade28600af95cf3d306987c41b0f340bb4a9ddd [formerly 72f1d7c950]
Former-commit-id: 2b82c39a59
|
2014-06-03 13:51:46 -05:00 |
|
Nate Jensen
|
290c559439
|
Merge "Omaha #3226 moved ost lightning code to new plugin" into omaha_14.4.1
Former-commit-id: 6d1c4f4c3a [formerly abb63ad32d] [formerly c3b8358eb6] [formerly 364e6ea94a [formerly c3b8358eb6 [formerly 87eef5bc338290f252879801b86e6df64b7c6f1c]]]
Former-commit-id: 364e6ea94a
Former-commit-id: 7c0af10cd7e43d48f87d7cdedd3290c18b0cf8ce [formerly a54e6006da]
Former-commit-id: ec6d669c18
|
2014-06-03 08:09:16 -05:00 |
|
Ron Anderson
|
9b0c3f2355
|
Omaha #3052 Improved TopoQuery error handling to throw exceptions with useful error messages.
Change-Id: Ic181682611801ea244b986e8a2ce1400c4dc15d1
Former-commit-id: 49d4eba710 [formerly bd50ae9854] [formerly 3f169399b8] [formerly 304364e356 [formerly 3f169399b8 [formerly 0d42d4fdc56122c3df912c93e5e09b0ab28c1b37]]]
Former-commit-id: 304364e356
Former-commit-id: bba329f4d5727f79bd95b57a11fd41ca3994a509 [formerly 3ff441f9da]
Former-commit-id: 060b0221fa
|
2014-06-02 17:14:18 -05:00 |
|
Brian Clements
|
f4b0de496f
|
Omaha #3226 moved ost lightning code to new plugin
fixed NPE when missing encryption config
Change-Id: I8ef6004f44b686918220e7729a499e456787a834
Former-commit-id: 789e19bb34 [formerly 0f029c3015] [formerly 664d9282c3] [formerly 6b09d9b3c5 [formerly 664d9282c3 [formerly 5421b666fc52e849e4ad5b39e2328a5c90a42408]]]
Former-commit-id: 6b09d9b3c5
Former-commit-id: 20cca433bf6ebc5592693bd3415c8e37bd31eb5c [formerly 7ff77c5960]
Former-commit-id: a4bebe81df
|
2014-06-02 15:33:41 -05:00 |
|
Nate Jensen
|
a0e18cdcc3
|
Merge "Omaha #3211 fix edex startup issues" into omaha_14.4.1
Former-commit-id: 2f4864154b [formerly 21468f0f2d] [formerly ff799b8044] [formerly 9269a938ce [formerly ff799b8044 [formerly 367289573446fcb10678af38ce36ab8797889a6d]]]
Former-commit-id: 9269a938ce
Former-commit-id: cae09aaa0ff825e2207df6f0f7689ac4be4cd91f [formerly 71981cb7ae]
Former-commit-id: 2e6bd78c02
|
2014-06-02 14:43:34 -05:00 |
|
Steve Harris
|
c3a1b210d4
|
Merge branch 'omaha_14.3.1' (14.3.1-9) into omaha_14.4.1
Former-commit-id: eae6622b5d [formerly 0255196956] [formerly 08b88a11ab] [formerly e24931a7f9 [formerly 08b88a11ab [formerly 7ab6907a20cb77106a26e528abcc83c961a2ed84]]]
Former-commit-id: e24931a7f9
Former-commit-id: 5808eb6401097685088885bbd39459501d998354 [formerly 54ba5cf81b]
Former-commit-id: ea54d3a2cf
|
2014-06-02 14:34:53 -05:00 |
|
Steve Harris
|
97a224f142
|
Merge branch 'master_14.3.1' (14.3.1-9) into omaha_14.3.1
Former-commit-id: c8b13897e1 [formerly 49732fbdb2] [formerly b3b768ee87] [formerly 78fc4d83f9 [formerly b3b768ee87 [formerly 4618c3ab6ae346649438d497712e4a8ab2ae91bd]]]
Former-commit-id: 78fc4d83f9
Former-commit-id: 29972ea7f01c8304c9d73f960f5e9449973960f7 [formerly e6f5716104]
Former-commit-id: 61758b5fda
|
2014-06-02 14:29:39 -05:00 |
|
Steve Harris
|
69b576e2f5
|
Issue #2754 - added .project file to ohd/com.raytheon.uf.edex.ohd.feature/
Former-commit-id: 6cadbdb1be [formerly f4ff7a4d9c] [formerly 4c41c736b1] [formerly 29e4453e2b [formerly 4c41c736b1 [formerly dd6245e5abd2973fd47e0cc5ca1b79470122181c]]]
Former-commit-id: 29e4453e2b
Former-commit-id: 0e68f41bdfb27cdfe982da59ac407a3cdfc01d29 [formerly bcaeec11a1]
Former-commit-id: 8bca727f50
|
2014-06-02 14:04:01 -05:00 |
|
cmadmin
|
1d3cedec1d
|
Merge "Omaha #3132 Fix ohd merge issues." into omaha_14.4.1
Former-commit-id: e12682d9cf [formerly 05dac7601b] [formerly e5ffd0f40c] [formerly 75ee567f85 [formerly e5ffd0f40c [formerly b57f019ff57da1193823bcba75698077f7c7e6b4]]]
Former-commit-id: 75ee567f85
Former-commit-id: 2c142cfef9987aa0c2ddba74bd48df886c19aa3a [formerly 447e46f682]
Former-commit-id: abf7fa2bdc
|
2014-06-02 13:59:15 -05:00 |
|
Ron Anderson
|
30a09154a7
|
Omaha #3132 Fix ohd merge issues.
Change-Id: I9cd7f10b55d4e599152827e4f5a793be11ce37fc
Former-commit-id: 4c8028f252 [formerly 8ef6180ac2] [formerly fc8fd369a1e85a39baa26dd87581b3352058da51 [formerly 0c569e6249]] [formerly c294a06b72 [formerly 0c569e6249 [formerly 5b3b83fe73b905c1d3e3743baf632e1364475eaf]]]
Former-commit-id: c294a06b72
Former-commit-id: 061fa0af628b098d328bb877344fbce682fdfb38 [formerly 9343611362]
Former-commit-id: 87ab046a05
|
2014-06-02 13:40:26 -05:00 |
|