Commit graph

6358 commits

Author SHA1 Message Date
Richard Peter
8c2a97eb67 Merge "Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order." into omaha_14.4.1
Former-commit-id: 20eeb493bb [formerly 6d9db0784a] [formerly 20eeb493bb [formerly 6d9db0784a] [formerly e6ac1b2ec8 [formerly 1e9ec8669f14dcae4e59ba5e471906de3bdc01a9]]]
Former-commit-id: e6ac1b2ec8
Former-commit-id: 2965150f36 [formerly 3de8492ff3]
Former-commit-id: e659b5a694
2014-07-01 09:48:20 -05:00
Nathan Bowler
d54fa442d8 Omaha #3008 Refactor to use EventReport to parse reports and better log reports with missing fields. Update manifest. Log number of discarded reports. Discard all reports if missing the data range.
Change-Id: I63681d5172689711834f3d71df9424c68a1f5317

Former-commit-id: f3fc00fb32 [formerly 43f164e682] [formerly f3fc00fb32 [formerly 43f164e682] [formerly 6099815272 [formerly 2d389525e2897237a66eb145002a9ae8970c9993]]]
Former-commit-id: 6099815272
Former-commit-id: f667260f7c [formerly 175f879042]
Former-commit-id: 047fc6ec88
2014-07-01 09:19:15 -04:00
Nate Jensen
94cd22b009 Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1
Former-commit-id: 03efa73bd7 [formerly 63bc6ed372] [formerly 03efa73bd7 [formerly 63bc6ed372] [formerly fb84c94552 [formerly 933384a7ace268be2c267c7dd630dee6d1d42fd0]]]
Former-commit-id: fb84c94552
Former-commit-id: 7314f9c2f1 [formerly 01115d0ad0]
Former-commit-id: a2ab4f6c76
2014-06-30 16:21:09 -05:00
Benjamin Phillippe
3abde21053 Omaha #3255 Updated Proxy classes to include all java proxy config settings
Change-Id: Id59993de7bc0f8402f2842161bf8ba4bc2532c79

Former-commit-id: 15b1fb71dd [formerly 36ef9e7a1a] [formerly 15b1fb71dd [formerly 36ef9e7a1a] [formerly 0dd6262862 [formerly 6cd596e6ed8826365d0faeab766601f98ece4fca]]]
Former-commit-id: 0dd6262862
Former-commit-id: 2a294fcfce [formerly 3a90b09dbf]
Former-commit-id: f686610802
2014-06-30 16:00:58 -05:00
Brian Clements
be0185379b Omaha #1798 fixed collaboration drawing issues when leader shares new map
fixed cursor icon not updating properly
fixed attempting to draw to inactive layer

Change-Id: Ic0f29feddbd611d918ba9d7e5a515a7624bf72aa

Former-commit-id: 0125117d9c [formerly 88ba6b47ad] [formerly 0125117d9c [formerly 88ba6b47ad] [formerly fc70dbc86e [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]]]
Former-commit-id: fc70dbc86e
Former-commit-id: b186894f32 [formerly 44f8b3dce1]
Former-commit-id: 0be4260b4c
2014-06-30 15:57:58 -05:00
Nate Jensen
d189ad3b7a Omaha #3245 fix detection of correct ini file
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7

Former-commit-id: d72b56b988 [formerly bca39f8b39] [formerly d72b56b988 [formerly bca39f8b39] [formerly 48249301fc [formerly 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453]]]
Former-commit-id: 48249301fc
Former-commit-id: 0f0e890fce [formerly 1d6912b4dd]
Former-commit-id: 635e902b80
2014-06-30 15:53:41 -05:00
Greg Armendariz
941bc791a9 Omaha #3299 - Remove project file and change build reference
Former-commit-id: 20f5ccf9f0 [formerly f4063c8162] [formerly 20f5ccf9f0 [formerly f4063c8162] [formerly 40ad6795df [formerly c233ad285b9addca8a8be6074b1e2440896d2276]]]
Former-commit-id: 40ad6795df
Former-commit-id: 68846930ee [formerly 44b448738c]
Former-commit-id: d26bb8e2c2
2014-06-30 14:49:24 -05:00
Nate Jensen
25b2c1fa3e Omaha #3165 remove deprecated buildColorMap()
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed

Former-commit-id: a393ad429a [formerly 766d3323d3] [formerly a393ad429a [formerly 766d3323d3] [formerly 128950ec19 [formerly 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c]]]
Former-commit-id: 128950ec19
Former-commit-id: 4ac06c06ee [formerly 2bf3449e00]
Former-commit-id: 345de597a6
2014-06-30 13:22:57 -05:00
Lee Venable
44f67ce5ad Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
Former-commit-id: 02037fc2df [formerly 588d3084da] [formerly 02037fc2df [formerly 588d3084da] [formerly 07a7a00256 [formerly 3d267d269db54c12852b6b6e8c529d826fad1d90]]]
Former-commit-id: 07a7a00256
Former-commit-id: e5f1eaf67d [formerly c6e53f6a9b]
Former-commit-id: 6046a2cbe1
2014-06-30 13:15:31 -05:00
Nate Jensen
bb71f188a2 Merge "Omaha #3170 get accum value from multiple times if they are requested in FFMP geometry factory" into omaha_14.4.1
Former-commit-id: fff613478c [formerly 098322ded4] [formerly fff613478c [formerly 098322ded4] [formerly daacd735e7 [formerly af116a40bfc5f96ac5be8f638d02ad85ad19e454]]]
Former-commit-id: daacd735e7
Former-commit-id: e98a95687b [formerly 8a274be75f]
Former-commit-id: b0daf485ba
2014-06-30 12:04:21 -05:00
Nate Jensen
29a41f81c2 Merge "Omaha #3303 make FFMPResource interrogatable" into omaha_14.4.1
Former-commit-id: 1137ef84fd [formerly 9fddc57142] [formerly 1137ef84fd [formerly 9fddc57142] [formerly fdddf1e096 [formerly fe2b362a609f2d9aa60bc21e8c23ebbcc118a5dd]]]
Former-commit-id: fdddf1e096
Former-commit-id: cc66308aaa [formerly 1ac5c54ee3]
Former-commit-id: c6c921279a
2014-06-30 12:03:21 -05:00
Nate Jensen
b44c1dae06 Merge "Omaha #2760 Made external JMS route for registry events Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6" into omaha_14.4.1
Former-commit-id: 5577128de2 [formerly ef92f03f06] [formerly 5577128de2 [formerly ef92f03f06] [formerly d6008fc401 [formerly a3364fed45ee7b5872565ba0c5a1c645d416b4c9]]]
Former-commit-id: d6008fc401
Former-commit-id: 0bb74e3900 [formerly 4f0160d98a]
Former-commit-id: 58a5daa450
2014-06-30 11:04:55 -05:00
Slav Korolev
5395df01c9 Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
Former-commit-id: cd740de298 [formerly 1b870e21fc] [formerly cd740de298 [formerly 1b870e21fc] [formerly 1956077e1a [formerly 5c5513637b7eb223572cc3425a3c1623cde84d90]]]
Former-commit-id: 1956077e1a
Former-commit-id: e8811128fc [formerly 0f5a2c0233]
Former-commit-id: a78f0ea765
2014-06-30 09:40:32 -04:00
Richard Peter
50fdb66cb4 Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
Former-commit-id: bcffac8875 [formerly 706409b459] [formerly bcffac8875 [formerly 706409b459] [formerly f4cdd661fe [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]]]
Former-commit-id: f4cdd661fe
Former-commit-id: b94dc3b045 [formerly e3c3d55883]
Former-commit-id: 25dd598b55
2014-06-27 16:52:39 -05:00
Richard Peter
3847155429 Merge "Omaha #3281 made venue session views non-sticky (except for feed view)" into omaha_14.4.1
Former-commit-id: cfdb8eebfc [formerly 48aceec348] [formerly cfdb8eebfc [formerly 48aceec348] [formerly cfb9e6d0ad [formerly d7a09b5baa955732e94a0d043fc24e6a9770b7f1]]]
Former-commit-id: cfb9e6d0ad
Former-commit-id: d15be4d4a1 [formerly b1810026c8]
Former-commit-id: 8b8f6ff0fe
2014-06-27 16:51:36 -05:00
Brian Clements
ac986ca600 Omaha #3323 fixed collaboration disposed font issue
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2

Former-commit-id: 023d1bde0b [formerly dc7a76197d] [formerly 023d1bde0b [formerly dc7a76197d] [formerly fe149faffa [formerly e216af49d135ceeff5e6cd251c6742602230553c]]]
Former-commit-id: fe149faffa
Former-commit-id: b8dc75d192 [formerly cb108f12b8]
Former-commit-id: 0800ea7cb7
2014-06-27 16:33:27 -05:00
Richard Peter
97e3cc1fa6 Merge "Omaha #3319 switched capture to only dump live objects" into omaha_14.4.1
Former-commit-id: 88bde6f690 [formerly 363206fea0] [formerly 88bde6f690 [formerly 363206fea0] [formerly 52210230db [formerly f75593cb09fe67ca48feb7ac0e67aa2b13221d79]]]
Former-commit-id: 52210230db
Former-commit-id: ad1796d08c [formerly 743f247e16]
Former-commit-id: 5779cda971
2014-06-27 16:01:06 -05:00
Brian Clements
55e3b3673c Omaha #3281 made venue session views non-sticky (except for feed view)
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0

Former-commit-id: eb806a6bb3 [formerly 741afe7d39] [formerly eb806a6bb3 [formerly 741afe7d39] [formerly 31a08efb61 [formerly e7f48359f00b2e91b39b7646da0f9f409f5d3805]]]
Former-commit-id: 31a08efb61
Former-commit-id: 2350f7f630 [formerly ed2823daef]
Former-commit-id: c1bfab0914
2014-06-27 15:33:11 -05:00
Brian Clements
7d47dc8020 Omaha #3319 switched capture to only dump live objects
work around for java 1.7 G1 garbage collector jmap problem

Change-Id: I5dd8db5d2d98baacaa03a3b60d1d9c5cb350fc2d

Former-commit-id: 312f74a200 [formerly 92a510fcb8] [formerly 312f74a200 [formerly 92a510fcb8] [formerly fe6b3ff4b3 [formerly 54157c12af81c4e217d3ade436bc0b3723964cac]]]
Former-commit-id: fe6b3ff4b3
Former-commit-id: deb7669844 [formerly 6353125f62]
Former-commit-id: 4c49ba9f65
2014-06-27 12:47:17 -05:00
Slav Korolev
a8e4449248 Omaha #3234 - Removed HiResW-ARW-PR and HiResW-NMM-PR from the list.
Former-commit-id: 6e60afd8cf [formerly b72f146d95] [formerly 6e60afd8cf [formerly b72f146d95] [formerly f6e8dedfa3 [formerly 834358236059cbabd11e89b2d43f7f1c621ce2e5]]]
Former-commit-id: f6e8dedfa3
Former-commit-id: 34d57cd15e [formerly 03890f03e3]
Former-commit-id: 99fc9b951a
2014-06-27 12:29:25 -04:00
Brian Clements
03b93a13f0 Omaha #3214 excluded total lightning data from text distribution
Change-Id: I9ab3676be7dfae30c60f43eaec58baae32b37d76

Former-commit-id: 0d8668c6b9 [formerly f217240f5c] [formerly 0d8668c6b9 [formerly f217240f5c] [formerly 362e8d543f [formerly 360d6b0d35cdc824b7cfa64c4140eb4af55a0696]]]
Former-commit-id: 362e8d543f
Former-commit-id: 76464a3f93 [formerly eb19700c16]
Former-commit-id: e66894fc5a
2014-06-27 10:46:48 -05:00
Dave Hladky
963c1e9831 Omaha #2760 Made external JMS route for registry events
Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6

Former-commit-id: 445ddc86a5 [formerly 5556e447e6] [formerly 445ddc86a5 [formerly 5556e447e6] [formerly 0d1767a3d7 [formerly 22e51bc1f882c535c7bafcdfd84428700eb6e547]]]
Former-commit-id: 0d1767a3d7
Former-commit-id: 891aba68a8 [formerly aa507be41e]
Former-commit-id: 9ca81064df
2014-06-27 10:04:17 -05:00
Richard Peter
7daa1ed24b Omaha #3274 Tweak G1 Flags for Cave
Change-Id: I7d8ac93f2a245ff35261b2f98f997d201495c4f6

Former-commit-id: 6bc89f2420 [formerly 46f42687e2] [formerly 6bc89f2420 [formerly 46f42687e2] [formerly 56389ef395 [formerly e16fd779239a09735d6ea092058a39bc7263b2f1]]]
Former-commit-id: 56389ef395
Former-commit-id: 2d18721bd6 [formerly 5112bbb8d5]
Former-commit-id: c5003ff6c4
2014-06-26 17:46:57 -05:00
Matt Nash
adc1a6df6d Omaha #3303 make FFMPResource interrogatable
Change-Id: I59d0603f581034adc1607d69828c3c05c4051540

Former-commit-id: 8f71be817f [formerly 2be9c89722] [formerly 8f71be817f [formerly 2be9c89722] [formerly 58a9434254 [formerly 848a7c7428a42fe164312363c4eb3e4080d90d66]]]
Former-commit-id: 58a9434254
Former-commit-id: d4b6c9803e [formerly a82e71702a]
Former-commit-id: 0bfa8347a4
2014-06-26 17:30:22 -05:00
Matt Nash
695085f892 Omaha #3170 get accum value from multiple times if they are requested in FFMP geometry factory
Change-Id: Ia7759a942ec078ec5ce72b6c0007629e263d8a4a

Former-commit-id: 52f70f50f6 [formerly 983c2c71e0] [formerly 52f70f50f6 [formerly 983c2c71e0] [formerly f31bf67cca [formerly 2f027b86244a3080a62c02cc816dcdca59e4538f]]]
Former-commit-id: f31bf67cca
Former-commit-id: cd19ad85ae [formerly d4609b08d9]
Former-commit-id: 1be462cc91
2014-06-26 17:26:06 -05:00
Nate Jensen
dcd81e8743 Merge "Omaha #3096 fix DataTime to match the Python version" into omaha_14.4.1
Former-commit-id: b73b65af0e [formerly 4ed4ed2e28] [formerly b73b65af0e [formerly 4ed4ed2e28] [formerly 37b42c05cb [formerly 8ba50134638d4687cc654220e683e916eb0cea4b]]]
Former-commit-id: 37b42c05cb
Former-commit-id: 7c9b95eda5 [formerly 62228388e3]
Former-commit-id: 609b7716c7
2014-06-26 16:47:39 -05:00
Nate Jensen
329f14de63 Merge "Omaha #3236 thin client pref page supports proxy server as text or combo field" into omaha_14.4.1
Former-commit-id: 59ab35e889 [formerly 024bc29e10] [formerly 59ab35e889 [formerly 024bc29e10] [formerly 1f6df7f52f [formerly 40a9f54b7354de60eaf2b94d10615b2d6ad0720f]]]
Former-commit-id: 1f6df7f52f
Former-commit-id: 0c9596bff8 [formerly 96a065399e]
Former-commit-id: 58791a046a
2014-06-26 15:26:21 -05:00
Matt Nash
e721e52498 Omaha #3096 fix DataTime to match the Python version
Former-commit-id: 91720a1420 [formerly e32adf1ee4] [formerly 91720a1420 [formerly e32adf1ee4] [formerly 407ac96c93 [formerly d7e4329d0d9decf946b463bf40c64f4e968c871f]]]
Former-commit-id: 407ac96c93
Former-commit-id: 3371a2ec19 [formerly 6f0d089999]
Former-commit-id: 7b84f3ba22
2014-06-26 15:12:39 -05:00
Nate Jensen
f957dd8e18 Omaha #3236 thin client pref page supports proxy server as text or combo
field

Change-Id: I7514d27a9b404e1c33cb6f7292475ff99bed4de0

Former-commit-id: e5c3c32bcb [formerly f4c1691c8d] [formerly e5c3c32bcb [formerly f4c1691c8d] [formerly 061482b015 [formerly 1a9433a524e5b8267fc3303db0763ac4685ec46d]]]
Former-commit-id: 061482b015
Former-commit-id: dc99cf6c15 [formerly 40a3c0a372]
Former-commit-id: 392ddd5ce0
2014-06-26 15:06:38 -05:00
Slav Korolev
81ae177c42 Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 41e8e36b8d [formerly 900d5e8fbe] [formerly 41e8e36b8d [formerly 900d5e8fbe] [formerly 79f2c0efc6 [formerly 4dc7f664a3e96a43392eee011bd453310d8e12ab]]]
Former-commit-id: 79f2c0efc6
Former-commit-id: 90ad46ac58 [formerly 3b9ed35eb0]
Former-commit-id: 0a006483ae
2014-06-26 14:04:34 -04:00
Richard Peter
1f1975bd3a Merge "Omaha #3230 Add URMA." into omaha_14.4.1
Former-commit-id: f0cb9ef34a [formerly ed3b869bab] [formerly f0cb9ef34a [formerly ed3b869bab] [formerly f1823e07a2 [formerly 63c45abb10f633f5a088e7e4834595f4c6b5e11d]]]
Former-commit-id: f1823e07a2
Former-commit-id: 68ed668395 [formerly aa33cb51d1]
Former-commit-id: 2959cca1ea
2014-06-26 12:30:15 -05:00
Greg Armendariz
bff7c674d0 Omaha #3309 - Remove reference to slf4j-log4j library
Change-Id: Ib68dfa51f5240e52325f43865aa885cb3dff04e2

Former-commit-id: 58f93a0ecf [formerly 7764f65707] [formerly 58f93a0ecf [formerly 7764f65707] [formerly 58158a9e73 [formerly 2b2133b9d38453848c6f014704b7625668bcd980]]]
Former-commit-id: 58158a9e73
Former-commit-id: 91357204db [formerly 0fa9ec49a0]
Former-commit-id: 8389d99db2
2014-06-26 11:34:47 -05:00
Roger Ferrel
f954d93c5a Omaha #3230 Add URMA.
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df

Former-commit-id: 32ae3ba73f [formerly bd2d40faee] [formerly 32ae3ba73f [formerly bd2d40faee] [formerly ad6eac6e20 [formerly c6abaff91bc493c9a40e39a66afd2b2262697343]]]
Former-commit-id: ad6eac6e20
Former-commit-id: 6e37a43757 [formerly 801bdc8fc7]
Former-commit-id: 7fef8ed924
2014-06-26 11:16:09 -05:00
Richard Peter
84531eabe4 Omaha #3277 Update smart init launcher to allow additional threads.
Change-Id: I118d905823bd8304f0e5ea2087a16d3d8ee075ce

Former-commit-id: ae1fd15ab4 [formerly 584b7576af] [formerly ae1fd15ab4 [formerly 584b7576af] [formerly 8eb0b62db8 [formerly 475cb088596a89e3bd2818196e2f2e250930a95c]]]
Former-commit-id: 8eb0b62db8
Former-commit-id: 33f9c041c2 [formerly 364c886659]
Former-commit-id: 7cd25f23df
2014-06-26 10:27:33 -05:00
Dave Hladky
dce9962e54 Omaha #3273 Remove all reference off DD env variables from setup.env
Former-commit-id: b9c930dd14 [formerly f2b4bcfef1] [formerly b9c930dd14 [formerly f2b4bcfef1] [formerly dbf301b8c4 [formerly 0ad525e949fc9cf9390909128b4c590034f00963]]]
Former-commit-id: dbf301b8c4
Former-commit-id: 537a57784c [formerly bc75b00731]
Former-commit-id: f67bd17c03
2014-06-26 09:46:31 -05:00
Nate Jensen
66e045138a Merge "Omaha #3165 remove dead code from uengine" into omaha_14.4.1
Former-commit-id: 3d93d09abb [formerly f080f470d3] [formerly 3d93d09abb [formerly f080f470d3] [formerly 17a0af6054 [formerly 90641cbc7f84e7c99252870f84f653f853653d2e]]]
Former-commit-id: 17a0af6054
Former-commit-id: 7852f186f1 [formerly 2efe126e74]
Former-commit-id: b2b2750765
2014-06-26 08:42:44 -05:00
Greg Armendariz
37e6f55621 Merge "Omaha #3275 - moving developer tools to separate repository" into omaha_14.4.1
Former-commit-id: 11c275d9e7 [formerly 4ca605424b] [formerly 11c275d9e7 [formerly 4ca605424b] [formerly bda30b30fa [formerly 08e67f103d58dbc0af31096bc35a3b7ef4e35783]]]
Former-commit-id: bda30b30fa
Former-commit-id: 5d8eeebe95 [formerly 85a69a270a]
Former-commit-id: caffbc2a7c
2014-06-25 18:13:49 -05:00
Richard Peter
2150e9c03e Merge "Omaha #3306 Made DPA SSL comms work Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d" into omaha_14.4.1
Former-commit-id: fcb9c0a103 [formerly aab371b6ab] [formerly fcb9c0a103 [formerly aab371b6ab] [formerly bfb242f55c [formerly 7ce53f801d18c63d19e8679915fbefd341a3c804]]]
Former-commit-id: bfb242f55c
Former-commit-id: f85e08ff51 [formerly 0bd5a2b347]
Former-commit-id: 664a93b494
2014-06-25 17:26:24 -05:00
Nate Jensen
62137c0650 Omaha #3165 remove dead code from uengine
Change-Id: Id47a5c3ef95d606270f235b1c17c1abfa0919b08

Former-commit-id: 631c28cd53 [formerly b1216dd31b] [formerly 631c28cd53 [formerly b1216dd31b] [formerly 4718ca6614 [formerly ba4fed408842df8bf1cbfd46c467cbd58aed49bd]]]
Former-commit-id: 4718ca6614
Former-commit-id: 2324117d9e [formerly 6bdf7ce79a]
Former-commit-id: 66fae8e672
2014-06-25 16:59:07 -05:00
Steve Harris
e0abad27a0 Omaha #3275 - moving developer tools to separate repository
Former-commit-id: 6c0a7da2a0 [formerly 5fd1555ff9] [formerly 6c0a7da2a0 [formerly 5fd1555ff9] [formerly 436ce72db9 [formerly da96ff215e03ffdad7e7d157f6f5539663ad47ce]]]
Former-commit-id: 436ce72db9
Former-commit-id: 548f6ff8e6 [formerly 6e2d34ae96]
Former-commit-id: 5e80a12a32
2014-06-25 16:16:03 -05:00
Nate Jensen
30d4d8fe27 Merge "Omaha #3236 thin client connectivity dialog remembers past proxy servers" into omaha_14.4.1
Former-commit-id: 7b44d8ad2d [formerly 589f74f6d8] [formerly 7b44d8ad2d [formerly 589f74f6d8] [formerly 49a592b19f [formerly 3d352136996875ff1e66b9e41244d53e16a1b2c3]]]
Former-commit-id: 49a592b19f
Former-commit-id: c73138b29e [formerly 2b3f7f02e5]
Former-commit-id: e5c63a67ac
2014-06-25 12:07:28 -05:00
Ben Steffensmeier
c0b839ce78 Omaha #3164 Disable compression on server error 500.
Former-commit-id: 7df0be0722 [formerly d7cdfa655d] [formerly 7df0be0722 [formerly d7cdfa655d] [formerly 120e9099e4 [formerly 7b3f6fe3b0d1bf8011d1cfea2937c39e33d4f81e]]]
Former-commit-id: 120e9099e4
Former-commit-id: 93ecdeeb08 [formerly 8ea38a01a3]
Former-commit-id: 05ad65e8a0
2014-06-25 11:13:39 -05:00
Nate Jensen
124d873714 Merge "Omaha #3072 Remove RadarRecord dependency for Radial Mesh." into omaha_14.4.1
Former-commit-id: c9696dbd3b [formerly 791ab4913c] [formerly c9696dbd3b [formerly 791ab4913c] [formerly 4bd68c8bd0 [formerly 3a87ec22c684ea4abab3a6328cc50682c5315cb9]]]
Former-commit-id: 4bd68c8bd0
Former-commit-id: 299c77f875 [formerly ce7812983a]
Former-commit-id: 374fb4373e
2014-06-25 09:54:38 -05:00
Nate Jensen
73bc714f93 Omaha #3236 thin client connectivity dialog remembers past proxy servers
Change-Id: I54c6032e451366fd3dee67da874f79dc690caa2a

Former-commit-id: 054e8ba9b9 [formerly 3b1c37dc38] [formerly 054e8ba9b9 [formerly 3b1c37dc38] [formerly 760b0cb584 [formerly 353872377cc3f96db4d3a22c6646fccb3edcb865]]]
Former-commit-id: 760b0cb584
Former-commit-id: ad647e2e85 [formerly a727313c41]
Former-commit-id: 5854347d2b
2014-06-25 08:54:24 -05:00
Nate Jensen
775da8ecd4 Merge "Omaha #3311 fix storing UnlinkedContourVectorPacket" into omaha_14.4.1
Former-commit-id: 31804ce5f9 [formerly c59ee0663f] [formerly 31804ce5f9 [formerly c59ee0663f] [formerly adc60e187d [formerly ef2d479ff08fbdbed2e57f72046d8c9fb9baa421]]]
Former-commit-id: adc60e187d
Former-commit-id: 3e954acf16 [formerly 960b44b9fb]
Former-commit-id: 5fbe5c1f2e
2014-06-25 08:45:09 -05:00
Nate Jensen
0938ff0ab7 Merge "Omaha #3245 altered utility scripts to account for cave subprocess" into omaha_14.4.1
Former-commit-id: 9c058c1e56 [formerly eacd31aa9b] [formerly 9c058c1e56 [formerly eacd31aa9b] [formerly 425651652d [formerly 45ac7ca480ea49dabff490ccc5b29878f0481b90]]]
Former-commit-id: 425651652d
Former-commit-id: 7d54b214e1 [formerly 3b288534e4]
Former-commit-id: c811adf70b
2014-06-25 08:32:25 -05:00
Steve Harris
deb3e3e437 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/LockingFileOutputStream.java (moved to ufcore)

Former-commit-id: c6aa4b6cbd [formerly d9a3129339] [formerly c6aa4b6cbd [formerly d9a3129339] [formerly 23d0cf81f8 [formerly 11c37fed7aed29ee42661948db90fab14b49c93c]]]
Former-commit-id: 23d0cf81f8
Former-commit-id: 5a5b95e88e [formerly f6f5c5a395]
Former-commit-id: 766c6ca296
2014-06-25 07:11:58 -05:00
Ben Steffensmeier
8dbd523f44 Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
Former-commit-id: 08fe257daa [formerly e244664b7d] [formerly 08fe257daa [formerly e244664b7d] [formerly 5c4f89644c [formerly 664ae8372cd7df344ae66dfec599646b31dbd27b]]]
Former-commit-id: 5c4f89644c
Former-commit-id: d52b2254f5 [formerly 4d22a3c58e]
Former-commit-id: 397f83b2da
2014-06-24 18:16:09 -05:00
Nate Jensen
da51903415 Omaha #3311 fix storing UnlinkedContourVectorPacket
Change-Id: Iab87dbbcc2900ec781c881ca46bf23661fead2eb

Former-commit-id: af62c5950c [formerly e8beab36b6] [formerly af62c5950c [formerly e8beab36b6] [formerly d81fbb83ea [formerly 15a3026ccf38896b0858187c9e4d0e62a58c0336]]]
Former-commit-id: d81fbb83ea
Former-commit-id: db48912fc4 [formerly a4066337ec]
Former-commit-id: a0040bf8cc
2014-06-24 15:53:11 -05:00
Nate Jensen
3ca7ba6f4b Merge "Omaha #3235 Properly clear the coordinates map. Switch to slf4j. Update manifest. Precompile patterns. Add some Javadoc." into omaha_14.4.1
Former-commit-id: ee3d343a64 [formerly 0447d48232] [formerly ee3d343a64 [formerly 0447d48232] [formerly 8dc15b71b5 [formerly 976a1fff0ca0d531b667b18e63e775d1ccd90bbc]]]
Former-commit-id: 8dc15b71b5
Former-commit-id: 733d4740f8 [formerly fd0339464f]
Former-commit-id: 9f4f2add10
2014-06-24 13:20:10 -05:00