Commit graph

5636 commits

Author SHA1 Message Date
Lee Venable
a26966b107 Merge "Issue #3145 - Fix Scan threat labels, dispose font" into omaha_14.3.1
Former-commit-id: bb5cc2c9ac [formerly cd5956d21a] [formerly 364f0d877a] [formerly bb5cc2c9ac [formerly cd5956d21a] [formerly 364f0d877a] [formerly e3c6407be3 [formerly 364f0d877a [formerly 06b3cb4dd8f07600e6513a15a2495b485b0812b6]]]]
Former-commit-id: e3c6407be3
Former-commit-id: 0fc85255e4 [formerly a46987ef36] [formerly c5990d4401145dd3609123f0dd6741e9a15c26ae [formerly b06e8e6e3e]]
Former-commit-id: f1e762a37c388902d6115e2fd3f7522b258d9e24 [formerly d23ba206c9]
Former-commit-id: fb58021364
2014-05-09 11:14:51 -05:00
Nate Jensen
b8c59e1c04 Merge "Issue #2928: Increase default thriftService byte limit to 250MB" into omaha_14.3.1
Former-commit-id: ab17f8b84e [formerly ed687984f7] [formerly 486c69045d] [formerly ab17f8b84e [formerly ed687984f7] [formerly 486c69045d] [formerly 5849925092 [formerly 486c69045d [formerly dac16ee8f25f6f265426405ca2bff55aff5b57ba]]]]
Former-commit-id: 5849925092
Former-commit-id: 8bc0acc137 [formerly b663cb9989] [formerly d5ee78ec7147794ad7f544578dc0b0342780e4bf [formerly 9091c46153]]
Former-commit-id: c9dfaadb744b1006f89bec7160b2de0dab2183ab [formerly a82db1def6]
Former-commit-id: 86913d088c
2014-05-09 10:57:53 -05:00
Richard Peter
425a3d2511 Issue #2928: Increase default thriftService byte limit to 250MB
Change-Id: I8a55fbce410e1787946f2dd38b3a41c84aab20bd

Former-commit-id: 87dec39958 [formerly b809ed50fd] [formerly bd033db0f4] [formerly 87dec39958 [formerly b809ed50fd] [formerly bd033db0f4] [formerly acadd5b815 [formerly bd033db0f4 [formerly 1c5060d53524f195be7854ca66160d3d075c3112]]]]
Former-commit-id: acadd5b815
Former-commit-id: df357a67fe [formerly 036909b7ac] [formerly b8973f06ea7a4e92647ce294c743d62f40633638 [formerly 67d637938e]]
Former-commit-id: 7a18f1d090eb02a03ba77f2bd5693dec86fcfd21 [formerly f8a472f125]
Former-commit-id: 221d2553d5
2014-05-09 10:37:18 -05:00
Mike Duff
fb42111c6f Issue #3145 - Fix Scan threat labels, dispose font
Change-Id: I385e184d81a021a350c7df7ee4948ad7e407784d

Former-commit-id: 279dd3dbad [formerly 158fb46b9f] [formerly 03356dd554] [formerly 279dd3dbad [formerly 158fb46b9f] [formerly 03356dd554] [formerly a81569849b [formerly 03356dd554 [formerly 84bd0800b2652b31c06015fa49f816f1402f461d]]]]
Former-commit-id: a81569849b
Former-commit-id: 4d00418164 [formerly 456038d161] [formerly 9842522c95a5493559d096bac98243e002212bfa [formerly 4ec26b6e31]]
Former-commit-id: 51810eecf351cd58e7502b561c71bf23d6c392e4 [formerly 32f6ad40ec]
Former-commit-id: e4e8e0fe8e
2014-05-09 10:32:04 -05:00
Nate Jensen
eda42bf1ce Merge "Issue #3026 - feature.xml fix" into omaha_14.3.1
Former-commit-id: 3330d7e72d [formerly d0d20849b6] [formerly 575360192a] [formerly 3330d7e72d [formerly d0d20849b6] [formerly 575360192a] [formerly e8c4279d10 [formerly 575360192a [formerly 25e500435693940e378df086739fce8eefdba3bb]]]]
Former-commit-id: e8c4279d10
Former-commit-id: f15db04d4f [formerly e0365dd4a3] [formerly 0b7be915c239ef7a407a8fcd6ca62efe41a54d6d [formerly 95ca77688a]]
Former-commit-id: c09794a593028767668796108549b63ebd3664fe [formerly 191d3a0d06]
Former-commit-id: db6d756ffd
2014-05-09 09:53:25 -05:00
Mike Duff
433c3e5870 Issue #3026 - feature.xml fix
Change-Id: I07d5043a8c968fa841f4e94eee47617e018ea794

Former-commit-id: 53d81818d3 [formerly 7e996909d1] [formerly 78f2a26903] [formerly 53d81818d3 [formerly 7e996909d1] [formerly 78f2a26903] [formerly 038b2b7500 [formerly 78f2a26903 [formerly a44e412190741fcb0a91dd451ae538277ae0d79f]]]]
Former-commit-id: 038b2b7500
Former-commit-id: b8696720cd [formerly b73e635162] [formerly a4741aa0a763cbbf63af15c647cd18f0d20c6fd6 [formerly c7f5379b78]]
Former-commit-id: f790e152dd4e3d3ff28d723c849c82663943c0fd [formerly 25638a5b40]
Former-commit-id: c984973464
2014-05-09 09:27:10 -05:00
Nate Jensen
f295581023 Merge "Issue #2920 Fix default color of BOXED text." into omaha_14.3.1
Former-commit-id: 0218777451 [formerly 00642fb2c6] [formerly 508b1f7a16] [formerly 0218777451 [formerly 00642fb2c6] [formerly 508b1f7a16] [formerly d7e4827ec4 [formerly 508b1f7a16 [formerly 7586d91814535ff6ad1f620f973279fe17914e6b]]]]
Former-commit-id: d7e4827ec4
Former-commit-id: 99765ab821 [formerly 60a824728d] [formerly 82f6b0b5b7703cbb3ead5a955a74de67dabf3125 [formerly 649f316001]]
Former-commit-id: 03acabdf9fe953bedeebf2ba6d0c5157f11ff4b5 [formerly 20908979b0]
Former-commit-id: ec6de3c6d0
2014-05-09 09:23:15 -05:00
Ben Steffensmeier
dd8846091f Issue #2920 Fix default color of BOXED text.
Former-commit-id: ee99dba933 [formerly 60479824d1] [formerly 87ea43cf0d] [formerly ee99dba933 [formerly 60479824d1] [formerly 87ea43cf0d] [formerly 9d4c33ba91 [formerly 87ea43cf0d [formerly 59f12cd4cc60f0908c106cbc0572d3f84d0d509b]]]]
Former-commit-id: 9d4c33ba91
Former-commit-id: ad64b8b197 [formerly 082a5c515d] [formerly faee1aa6dd05debf6ff2f60a54d18fa91ba9f91e [formerly 199a2df79e]]
Former-commit-id: 12720115fd4f8d9e4e99d1304dadb73ecc9e8f71 [formerly 2b4d783fd7]
Former-commit-id: f0c4cc03a0
2014-05-08 18:18:08 -05:00
Bryan Kowal
c3507216ab Issue #3108 - update bignsharp for Windows 64-bit compatibility. Upgrade JNA.
Amend: updated and/or added change revision history comments
Amend: fixed Java requirement in JNA classpath
Amend: fixed Java requirement in JNA MANIFEST

Change-Id: I5033f05c48a271fe08d3ec2ac01fe79481564371

Former-commit-id: 70db1c7dc7 [formerly 79244f5032] [formerly 1e1f46e68b] [formerly 70db1c7dc7 [formerly 79244f5032] [formerly 1e1f46e68b] [formerly 9c29e6739c [formerly 1e1f46e68b [formerly fb12234836a3562156a30531e6961c0a064588bd]]]]
Former-commit-id: 9c29e6739c
Former-commit-id: 5fc64e628b [formerly 2098b015f1] [formerly 76e1a6eaf85a9ea37060e092691ba1ca871a7e9e [formerly c1e9154e89]]
Former-commit-id: 491c71dfd490dfdd3f6e724c9a0449ec60e6848b [formerly ec41dab6d0]
Former-commit-id: a07ad6724e
2014-05-08 17:30:22 -05:00
Mike Duff
f924c12ec6 Issue #3026 - NullPointer fix, test classpath fix
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1

Former-commit-id: 03a2c17f36 [formerly a6e0ed67d1] [formerly b23473ee8a] [formerly 03a2c17f36 [formerly a6e0ed67d1] [formerly b23473ee8a] [formerly 335c02d2c6 [formerly b23473ee8a [formerly 8e70b7ae1eef7a18ddffa6d6c88d10bdd0043bcc]]]]
Former-commit-id: 335c02d2c6
Former-commit-id: 69e7cfa1ed [formerly 0df3f51c87] [formerly 66a76d720a0c13b3fdb3b03633d297e5d51e2487 [formerly 16a973372e]]
Former-commit-id: 5303ea642886a0d2399938a4719d496c60301888 [formerly 1dc95cf8de]
Former-commit-id: 718fc22e25
2014-05-08 15:02:54 -05:00
Lee Venable
1f7df07379 Merge "Issue #2060 fix auto-update errors with grids in non-map displays" into omaha_14.3.1
Former-commit-id: b6cd70f862 [formerly 319073a795] [formerly 92517d3ca2] [formerly b6cd70f862 [formerly 319073a795] [formerly 92517d3ca2] [formerly 1496955e44 [formerly 92517d3ca2 [formerly a47409fd1673c9584c46aba496be1b7203d9c45d]]]]
Former-commit-id: 1496955e44
Former-commit-id: 892931b35d [formerly 0a45b07910] [formerly 119a16b3db169db721207a3f9638ba432a91fdca [formerly 0b25428b04]]
Former-commit-id: 2b7f8d7ee26b23e61bb5beb3148f45bc926cc808 [formerly 0075d2a450]
Former-commit-id: 70e31865be
2014-05-08 14:47:03 -05:00
Mike Duff
8904d8a501 Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13

Former-commit-id: f4062cd277 [formerly 0456fd0597] [formerly 8498235fd8] [formerly f4062cd277 [formerly 0456fd0597] [formerly 8498235fd8] [formerly 6a67638a94 [formerly 8498235fd8 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]]]
Former-commit-id: 6a67638a94
Former-commit-id: 3966697849 [formerly f49192936a] [formerly 2876e8ca8c3ac5b87e9cb00735e694e84a5f8df9 [formerly 70c8135fde]]
Former-commit-id: 79e94a80e7729225dba251b67e17c3517adc7fc5 [formerly 916d90ee64]
Former-commit-id: 4adf657556
2014-05-08 14:36:54 -05:00
Nate Jensen
4371f25d2f Issue #2060 fix auto-update errors with grids in non-map displays
Change-Id: Id99693f6fd54d56a4a1255f7ee5e2308e2f5d9de

Former-commit-id: 71603c2319 [formerly 84f9cd1dc8] [formerly 3e3035b6f1] [formerly 71603c2319 [formerly 84f9cd1dc8] [formerly 3e3035b6f1] [formerly ecc5c5849f [formerly 3e3035b6f1 [formerly a139113883f69be89a0e0a771f8d6f48d3948686]]]]
Former-commit-id: ecc5c5849f
Former-commit-id: 3084f2db9b [formerly d2070f782b] [formerly dbf49869a035aa878141a00faf9086e7e8f0b3ee [formerly 6c55f4832c]]
Former-commit-id: 3c69ed9e2d78d7ce30d54845811924f5c2bf2483 [formerly 93f71ec65c]
Former-commit-id: 1dc7cc875e
2014-05-08 14:08:06 -05:00
Ben Steffensmeier
2f6a279abb Issue #3080 Fix NaN handling of SliceSample.
Former-commit-id: 7a38637fb2 [formerly 3a87fa24df] [formerly 0308147ad4] [formerly 7a38637fb2 [formerly 3a87fa24df] [formerly 0308147ad4] [formerly 1b6bdeac86 [formerly 0308147ad4 [formerly 9974018df428c84528cf98e9f868740accbabf58]]]]
Former-commit-id: 1b6bdeac86
Former-commit-id: 33e1805458 [formerly 7beb6429d4] [formerly 883fef057790d3aff91a5945cdfc9c0bb814b3f2 [formerly 80a819f65b]]
Former-commit-id: d2c3a48395c4fe09a3166b1dc9b5cb8612aa5178 [formerly c56d799865]
Former-commit-id: a32bb9b996
2014-05-08 11:49:04 -05:00
Nate Jensen
098587a86f Merge "Issue #2726: Fix GeospatialDataGenerator NPE" into omaha_14.3.1
Former-commit-id: b415dd5c4e [formerly 3fdd5dbdd6] [formerly 8f8ac40c44] [formerly b415dd5c4e [formerly 3fdd5dbdd6] [formerly 8f8ac40c44] [formerly d4fef60be1 [formerly 8f8ac40c44 [formerly 34d2d296f304cd84a8105993803ca35c484c6b6e]]]]
Former-commit-id: d4fef60be1
Former-commit-id: c771f70e7d [formerly a50afc30eb] [formerly a27e3174303ab185af39074281bca050c97c43f0 [formerly 04e906f1a6]]
Former-commit-id: 0f96a1d44d0926b4c44251c9b15a83c3732d3da2 [formerly 677e1662d7]
Former-commit-id: e3d66c87ec
2014-05-08 10:19:43 -05:00
Richard Peter
045900bdb8 Issue #2726: Fix GeospatialDataGenerator NPE
Change-Id: I07213e17fcbbadea9a33471c390bb07472ba31e0

Former-commit-id: 469f2771c3 [formerly 5a7c78c009] [formerly 24539708f9] [formerly 469f2771c3 [formerly 5a7c78c009] [formerly 24539708f9] [formerly 4d99d25a55 [formerly 24539708f9 [formerly fdc542df454887a48f4a55ef6ea9594ff98b3345]]]]
Former-commit-id: 4d99d25a55
Former-commit-id: a65504b301 [formerly 3c21c1042f] [formerly 3612a21996e81b3e6f673f5982a4a6b310ad9022 [formerly 29a8db5216]]
Former-commit-id: 25a31e90dd26b0d819ae4d0ebd928e5b7e5f1143 [formerly 601f151a8b]
Former-commit-id: f5e8f07e8b
2014-05-08 10:14:30 -05:00
Nate Jensen
b725b764ba Issue #2060 fix grid updates and performance
Change-Id: I0937d7360e456f08fb613be547f7b488ebe05b50

Former-commit-id: c41e84630c [formerly c71edb2d4c] [formerly e39378e5f0] [formerly c41e84630c [formerly c71edb2d4c] [formerly e39378e5f0] [formerly acfbce58d1 [formerly e39378e5f0 [formerly a430e85f283b3e41b8520d241f675eff3c6c32e3]]]]
Former-commit-id: acfbce58d1
Former-commit-id: 5289cdf95c [formerly 81b914ad9f] [formerly 18c8713f5f8a78687f4fbd908e1803323d6f2ff0 [formerly 5099fd6463]]
Former-commit-id: 16abadc65ba62f39c5351391736255373944ce3c [formerly f4bb539ae8]
Former-commit-id: 4f18fe5173
2014-05-07 15:30:13 -05:00
Dave Hladky
d740131519 Issue #2940 More filenames printed, null from bad rec.
Former-commit-id: e40c9a7be8 [formerly cd4921b35f] [formerly a2ef100bfc] [formerly e40c9a7be8 [formerly cd4921b35f] [formerly a2ef100bfc] [formerly dadc604ab3 [formerly a2ef100bfc [formerly 26bfd426965d208f92bcb1fcd650b5f2299724a4]]]]
Former-commit-id: dadc604ab3
Former-commit-id: af478efa5d [formerly e58fa39adc] [formerly 30f08e0872c7bff47d05e441f1dd1375d4fa9d03 [formerly f54cbb83a1]]
Former-commit-id: 703f3933ff157bb876bac2fb5586159e18bb37bb [formerly 07c49a82b5]
Former-commit-id: 24a1a5a0c6
2014-05-07 14:51:38 -05:00
Nate Jensen
88f134aef8 Issue #2060 log successful sat precip file creation
Change-Id: I40df627645e0c0e089609f8dcc56b8351a4c56f1

Former-commit-id: a66c157399 [formerly 3c1f9693f2] [formerly f06c77f5ad] [formerly a66c157399 [formerly 3c1f9693f2] [formerly f06c77f5ad] [formerly 170106ad44 [formerly f06c77f5ad [formerly b3158ae940ab59a7a96b4650f0f956c82b0c9d49]]]]
Former-commit-id: 170106ad44
Former-commit-id: e979a3caeb [formerly 40b5e501a2] [formerly 29afb4d86748112fab5054cd93607ac60cb3b546 [formerly af426cf278]]
Former-commit-id: 88312d3bdae00a1d038799307c725c29addd6aaa [formerly 505b45ff22]
Former-commit-id: 6a620ffc04
2014-05-07 09:44:20 -05:00
Nate Jensen
fe086727bb Merge "Issue #3101 fix some derived parameters on win64 platform" into omaha_14.3.1
Former-commit-id: 7193103faf [formerly be75956418] [formerly ddb3610e24] [formerly 7193103faf [formerly be75956418] [formerly ddb3610e24] [formerly 69b6c9426f [formerly ddb3610e24 [formerly 31d9df701d689ceaf76c9d241d36df5c9c463bb3]]]]
Former-commit-id: 69b6c9426f
Former-commit-id: 02be49d972 [formerly f2e1ee0aeb] [formerly d847d191e396a392b956f225e997154b5bd29006 [formerly 7360ee5c1a]]
Former-commit-id: 2eb9777b7d68cf5456e94bea7e9cd0225efae5d9 [formerly 7d8a767030]
Former-commit-id: d1493a3a82
2014-05-06 17:29:45 -05:00
Nate Jensen
e98ed9042a Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
Former-commit-id: e93e248f9a [formerly daac0701fc] [formerly d271dfb1a5] [formerly e93e248f9a [formerly daac0701fc] [formerly d271dfb1a5] [formerly 0f1cab916a [formerly d271dfb1a5 [formerly 37c2d25d9ff0076d1cab4f818e45c6ccead82105]]]]
Former-commit-id: 0f1cab916a
Former-commit-id: 1adf6d304f [formerly 89621db281] [formerly 47226b181942be9b2bff4189674708a517376408 [formerly 70f70371b1]]
Former-commit-id: 2f4818061c868c793957c6720b9ab0b1d1c1a29f [formerly 12f88d14bf]
Former-commit-id: 76750c319a
2014-05-06 17:09:56 -05:00
Nate Jensen
9831077b42 Issue #3101 fix some derived parameters on win64 platform
Change-Id: I9de1d31e7f7c19af437aef834aa84f163bf36d86

Former-commit-id: 3aa9bfdca1 [formerly 49d34cc4e4] [formerly 5191b61b30] [formerly 3aa9bfdca1 [formerly 49d34cc4e4] [formerly 5191b61b30] [formerly aa7c1fac90 [formerly 5191b61b30 [formerly 4659c0240aa31b615bc50228906d514f47a72f94]]]]
Former-commit-id: aa7c1fac90
Former-commit-id: c333277d30 [formerly 815aa21d8e] [formerly e218d9c6b2e2544a412d7bf24b528ba73c8cd8fc [formerly 8c1748d370]]
Former-commit-id: a4bf8704f87869be96548083ce3e4e75a769e292 [formerly b708774e64]
Former-commit-id: cf09a6729c
2014-05-06 17:08:04 -05:00
Ben Steffensmeier
41fead7d98 Issue #3117 update satellite inventory for new sectors or elements.
Former-commit-id: 34c4ce1630 [formerly e70a6999b7] [formerly bbbf957ba8] [formerly 34c4ce1630 [formerly e70a6999b7] [formerly bbbf957ba8] [formerly 70df0ee87e [formerly bbbf957ba8 [formerly 35845fa63be35661893d31510f83e2d9ab6f60af]]]]
Former-commit-id: 70df0ee87e
Former-commit-id: c83559ee61 [formerly 81916ecdb6] [formerly 4e4ce9614076e1c738d79e3feab9658310edbcb5 [formerly 945fe1db2f]]
Former-commit-id: 0e99b439ffe3cb3eb47009242d3ff465ec38fa5e [formerly a39b05ac71]
Former-commit-id: b978e0fc1d
2014-05-06 16:19:58 -05:00
Nate Jensen
fb64a8684f Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
Former-commit-id: 0b046a18e1 [formerly 26f47e3b00] [formerly a583493711] [formerly 0b046a18e1 [formerly 26f47e3b00] [formerly a583493711] [formerly 8f8ea5d014 [formerly a583493711 [formerly 26eb2500104f7afe3fb07ddd66299aa1486375d2]]]]
Former-commit-id: 8f8ea5d014
Former-commit-id: baf8e4a3ea [formerly 4f3570324a] [formerly 532ed751ce54ccf8c69036528d3a9d6ed5bdb7dd [formerly f1c48f10b1]]
Former-commit-id: 7e9a62127f91ff74917a295a5da19fae49aff58f [formerly a20245a64d]
Former-commit-id: 3aa1481c98
2014-05-06 16:15:41 -05:00
Richard Peter
c85f22eb55 Issue #2726: update smartInit threads to 1
Change-Id: Ic2d432087f66fd9f03b3d6f01fefce8af0d5b0b0

Former-commit-id: 2044b64206 [formerly 884562700a] [formerly 03ab7599de] [formerly 2044b64206 [formerly 884562700a] [formerly 03ab7599de] [formerly 611c010968 [formerly 03ab7599de [formerly c12469d133558750e85049f7ce0f0a42b802c2b9]]]]
Former-commit-id: 611c010968
Former-commit-id: 8e8e1c45ed [formerly be288505e0] [formerly f30788353ad2101cd2e64a4eed43d47dc68ddbb5 [formerly 4f2d470801]]
Former-commit-id: 91832432fed4e1ab82df2940b746247f362e5e2d [formerly a03997122b]
Former-commit-id: fc1f958e5b
2014-05-06 15:54:23 -05:00
Nate Jensen
12e89bf78d Issue #2060 genericize DataURIFieldConverter
Change-Id: I885b0a8ec64eb69256c04fa2476814b1300fcdd4

Former-commit-id: 37b72c933b [formerly 7701820902] [formerly ff6c77420c] [formerly 37b72c933b [formerly 7701820902] [formerly ff6c77420c] [formerly 87b6df4840 [formerly ff6c77420c [formerly 0a7265da59457e8dc6a122db81b134d6555d5276]]]]
Former-commit-id: 87b6df4840
Former-commit-id: b16bfd2b38 [formerly d1a040b9c2] [formerly 620466e14629a8e102bf9c9fd5dc3bbc2e70ff37 [formerly a6363fc3d4]]
Former-commit-id: 176e5be59eab5566cf29af7c6865a3042d0ab473 [formerly 5f08921768]
Former-commit-id: 17ddc5d8e5
2014-05-06 13:10:48 -05:00
Nate Jensen
77045e05ce Merge "Issue #2060 fill in units on GridRecords created from URIs" into omaha_14.3.1
Former-commit-id: 8b2c2d4be5 [formerly d83fad0054] [formerly 0e3876de34] [formerly 8b2c2d4be5 [formerly d83fad0054] [formerly 0e3876de34] [formerly 4f734ae7f9 [formerly 0e3876de34 [formerly c68f2924c4c7f998af859d7c88cd9d0049d636e5]]]]
Former-commit-id: 4f734ae7f9
Former-commit-id: de7bade647 [formerly 732aaa6001] [formerly ad966bafd4b27ea29634f0d48df0a0cd01558773 [formerly 044d086fc1]]
Former-commit-id: 6911bb772bb5191fbb00c039757c3640c87a1879 [formerly 4db3b99181]
Former-commit-id: c8cc3b1b8e
2014-05-06 13:09:12 -05:00
Nate Jensen
8a31b5edf5 Issue #2060 fill in units on GridRecords created from URIs
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a

Former-commit-id: 1d38804eb2 [formerly 3719c41d2b] [formerly 71b4227061] [formerly 1d38804eb2 [formerly 3719c41d2b] [formerly 71b4227061] [formerly 7cea97ab15 [formerly 71b4227061 [formerly 949d132cf3260db5f75ea665f21601ab91440958]]]]
Former-commit-id: 7cea97ab15
Former-commit-id: e8ca9729eb [formerly 5bf1554597] [formerly 4cf3887df369f38b75f0a2c9f9f7949057e50e42 [formerly 6bdbfb7e1a]]
Former-commit-id: 0fc7bbac68e600996cc014bbf843e66d5484e6e9 [formerly 66cd43313a]
Former-commit-id: ad7a69f2e3
2014-05-06 12:26:21 -05:00
Richard Peter
a21d7ff038 Issue #2726: Autoset route startup order.
Change-Id: I1f4165b6eab12207cf6b6d31964e8170ebe1bddc

Former-commit-id: f76ed476c8 [formerly 8ae9cfba55] [formerly b148d11ec9] [formerly f76ed476c8 [formerly 8ae9cfba55] [formerly b148d11ec9] [formerly 4dc91f494f [formerly b148d11ec9 [formerly 9b9d2b475f4777febf125e4013cba0d971eaf8e8]]]]
Former-commit-id: 4dc91f494f
Former-commit-id: 9846fbd82c [formerly 7fe7b43ee2] [formerly c051c2b6a07908c54dd3268091a67a3084664d5b [formerly c6719da76b]]
Former-commit-id: 87bf6e58065855e010b5eeaf478f1099b3c04845 [formerly 4a140afac6]
Former-commit-id: 4f6a9a0562
2014-05-06 09:46:41 -05:00
Brian Clements
8bb6a1ac40 Issue #3076 added clear all to shared display sessions
Former-commit-id: 02c921ed12 [formerly 729e717be1] [formerly f545c548cc] [formerly 02c921ed12 [formerly 729e717be1] [formerly f545c548cc] [formerly 1432aa1302 [formerly f545c548cc [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]]]
Former-commit-id: 1432aa1302
Former-commit-id: 0fbb5dc22a [formerly 8674841154] [formerly bcb942f3e18364de413f94465a2f8a874c91dc8e [formerly 5583c3903b]]
Former-commit-id: db57e64f5cb253ecb97388555bf76c0cac27eaf9 [formerly 3a60b0db05]
Former-commit-id: 89f3a0a1d2
2014-05-06 09:30:07 -05:00
Lee Venable
4a44bbed48 Issue #3109 - removed code that sets the Cave cursor.
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470

Former-commit-id: a57f0e338d [formerly 550668cbf7] [formerly a6c2260dd1] [formerly a57f0e338d [formerly 550668cbf7] [formerly a6c2260dd1] [formerly b0a251f4e3 [formerly a6c2260dd1 [formerly d875f73ff44986b2c7862f0dee06504d576fd96b]]]]
Former-commit-id: b0a251f4e3
Former-commit-id: a8864844bb [formerly a092fd45dc] [formerly 99c525ad61eed1107476ce09523a10adfb16b511 [formerly 631a8d3cb1]]
Former-commit-id: d050d7aa9271504d20368a3a4fa3054d4a97cc2d [formerly f48d571cb6]
Former-commit-id: 46eb74e982
2014-05-05 16:13:31 -05:00
Nate Jensen
0fc04a8c55 Issue #2060 fix sat precip for grid data URI removal
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58

Former-commit-id: f76ace3c9b [formerly 2b6c30e67d] [formerly 0cf0f724f4] [formerly f76ace3c9b [formerly 2b6c30e67d] [formerly 0cf0f724f4] [formerly d82f6e5ff6 [formerly 0cf0f724f4 [formerly cf0bb31583f0ec0b2135aa9101f3247e88e877d0]]]]
Former-commit-id: d82f6e5ff6
Former-commit-id: 3853ef16bb [formerly 09091ccf25] [formerly 7beb650628fb602c30c71cbf5eab29724e2cc3f8 [formerly 97597c3ab1]]
Former-commit-id: 34e886c76b22b953edb7a826d23a880a02b62b77 [formerly 0840a62eb8]
Former-commit-id: d50f19d715
2014-05-05 13:06:08 -05:00
Dave Hladky
766d9f09a7 Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java

Former-commit-id: 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 333bf8b36d [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: d9243205e4 [formerly 93ca9cfe6a] [formerly 407941b24c780437890a6937639d0d55a05f02fd [formerly 7611339cd8]]
Former-commit-id: 1470be2678cc30858e885d64731cb2816e28e3ab [formerly cb94f9fc97]
Former-commit-id: 7e763a5a22
2014-05-05 12:15:14 -05:00
Nate Jensen
ef530e538d Merge "Issue #2956 more safety checks" into omaha_14.3.1
Former-commit-id: a2607513bf [formerly f233d104d7] [formerly e9b3041170] [formerly a2607513bf [formerly f233d104d7] [formerly e9b3041170] [formerly d6518bede1 [formerly e9b3041170 [formerly c4d06eea732629d5fac66593269ec82b9ee6463d]]]]
Former-commit-id: d6518bede1
Former-commit-id: dcbedcbbc0 [formerly e8e971d434] [formerly bd03fd08ecba17789cb90578917e1a4d7b88234a [formerly 8ee8937daf]]
Former-commit-id: 691f6074396a107be1d2cd9bbea9d5f5ba7b2d31 [formerly e8b7cec960]
Former-commit-id: 3eaaf56f8e
2014-05-05 09:45:11 -05:00
Richard Peter
ce48a0230e Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
Former-commit-id: 98fa705dd0 [formerly f38816d168] [formerly dc0b598fd4] [formerly 98fa705dd0 [formerly f38816d168] [formerly dc0b598fd4] [formerly 132d63ac44 [formerly dc0b598fd4 [formerly 28b33188773001c34946464093319dc2a1117be9]]]]
Former-commit-id: 132d63ac44
Former-commit-id: 2507aaf753 [formerly 8e141a137a] [formerly c5d890d7b24b88a20dc8c01d92647c6864edfb22 [formerly 5314b412b4]]
Former-commit-id: ad8d5ade754f2f63500d72978fe455c4ad54fb06 [formerly b9351199b8]
Former-commit-id: 9326b9d125
2014-05-02 10:05:59 -05:00
Richard Peter
aa4e137fe6 Merge "Issue #3095 Update JGridData for creation of numeric java package." into omaha_14.3.1
Former-commit-id: 39467f210d [formerly 6bb353a05d] [formerly 51ba60d62b] [formerly 39467f210d [formerly 6bb353a05d] [formerly 51ba60d62b] [formerly 24f1c7b385 [formerly 51ba60d62b [formerly cab873d5b9437b8abd22adb65c42b886710e50a9]]]]
Former-commit-id: 24f1c7b385
Former-commit-id: 0dda5a7c40 [formerly 592e9171e1] [formerly f5cd6aa1d45daa261c05965acd4769b63f5b3227 [formerly 1f7e076018]]
Former-commit-id: e5558a5d7b030baee414180a9b43047e86f30a39 [formerly 28c8c6357a]
Former-commit-id: f34020dcc0
2014-05-02 10:05:29 -05:00
Richard Peter
6b93ff149a Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
Former-commit-id: aeebf17373 [formerly 4e1bc16d70] [formerly 478cedd3a3] [formerly aeebf17373 [formerly 4e1bc16d70] [formerly 478cedd3a3] [formerly d4a138c534 [formerly 478cedd3a3 [formerly f124cee1070a3dd0e09cb54f773f63095f18bd16]]]]
Former-commit-id: d4a138c534
Former-commit-id: 4537e1276f [formerly 160ce06137] [formerly ca0cfca3ed26cc4f000b74ac3d1f482f80140ed2 [formerly 1b7dd13525]]
Former-commit-id: 1d7a263d7bb684e35dafbb6c76df324cb708edde [formerly 67eb0867ea]
Former-commit-id: 7481634fdb
2014-05-02 09:50:40 -05:00
Ben Steffensmeier
c2e3e72d01 Issue #3095 Update JGridData for creation of numeric java package.
Former-commit-id: 80104eaf42 [formerly 956f62a6ec] [formerly 6bdaba048c] [formerly 80104eaf42 [formerly 956f62a6ec] [formerly 6bdaba048c] [formerly 23d6da4a18 [formerly 6bdaba048c [formerly a3081bf46908788e78c707bf51e08f6c98d997bc]]]]
Former-commit-id: 23d6da4a18
Former-commit-id: ae0185a740 [formerly d2c0499f2c] [formerly e59b9a37c055ead6793b199f1f61c40b65e25ce2 [formerly 3300d8c75c]]
Former-commit-id: b8a7373be1db5d578132241657b4da4ea3baedd5 [formerly c2a3dbe9af]
Former-commit-id: dd315aa9b8
2014-05-01 18:02:08 -05:00
Richard Peter
711be53fea Issue #2854: Pack commons.lang for alertviz
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166

Former-commit-id: 36d579c206 [formerly 1738b065b8] [formerly a9b088146c] [formerly 36d579c206 [formerly 1738b065b8] [formerly a9b088146c] [formerly bcd87195ee [formerly a9b088146c [formerly 7d69b9fdc60b0c07121eab0119cf45b1624653cd]]]]
Former-commit-id: bcd87195ee
Former-commit-id: 2d597d61ab [formerly 926cd5f6d1] [formerly 3fa1d18ae07b1ff8c4ffc4b83cd39952d11ded1d [formerly e1a2767f8f]]
Former-commit-id: 4fe9ed9b053941aaa7d97f487449c7e8441c5f10 [formerly df422d1516]
Former-commit-id: 338b2c53d0
2014-05-01 16:30:21 -05:00
Nate Jensen
2b6ad3264c Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e

Former-commit-id: 54c6d5d07f [formerly d759efcaa8] [formerly f4d20c41f4] [formerly 54c6d5d07f [formerly d759efcaa8] [formerly f4d20c41f4] [formerly 7d142d9d9d [formerly f4d20c41f4 [formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]]]
Former-commit-id: 7d142d9d9d
Former-commit-id: 9f08442039 [formerly 6f211aa9f8] [formerly fb99f58ad5a7cfb43ae453f0c000e943ba999928 [formerly f3b68178bd]]
Former-commit-id: 930f4906645edbcafbe567a1652cb392d52f18a5 [formerly 3f9a33bf35]
Former-commit-id: 42a27546f9
2014-05-01 16:28:16 -05:00
Nate Jensen
e2a024ea00 Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
Change-Id: I25bd1305568d26940b69565f53a06661955f240b

Former-commit-id: 8d5ec4bb04 [formerly 3222914fde] [formerly 137818d03a] [formerly 8d5ec4bb04 [formerly 3222914fde] [formerly 137818d03a] [formerly a73a310709 [formerly 137818d03a [formerly 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64]]]]
Former-commit-id: a73a310709
Former-commit-id: 834dd4895a [formerly b245e49d53] [formerly 61860d514df7120cc0bb0d8c083c115b3944aa73 [formerly 84dbedcff5]]
Former-commit-id: 48dea045c9df8e5f4f88eaca3f0e152ddc64138d [formerly c7ddb6d476]
Former-commit-id: 562a70b8fb
2014-05-01 16:20:35 -05:00
Richard Peter
d2682acaf2 Issue #2854: Fix features.
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe

Former-commit-id: c7f5b23633 [formerly 25fd0e03f4] [formerly 4056f53fa2] [formerly c7f5b23633 [formerly 25fd0e03f4] [formerly 4056f53fa2] [formerly a4fb460e17 [formerly 4056f53fa2 [formerly 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b]]]]
Former-commit-id: a4fb460e17
Former-commit-id: 3297632b5d [formerly f364f02f58] [formerly 38c78f7ac3ebdff8190b01723125c22a2058c85f [formerly c3c7ebb146]]
Former-commit-id: 7a8980241b9c8931fec2ce1f756924532831bd95 [formerly 472077fbd5]
Former-commit-id: b8bdced87a
2014-05-01 14:47:41 -05:00
Steve Harris
059faff023 Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
Former-commit-id: d2905e51d4 [formerly 9ecd871825] [formerly c8ba70a146] [formerly d2905e51d4 [formerly 9ecd871825] [formerly c8ba70a146] [formerly 779e85cc77 [formerly c8ba70a146 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]]]
Former-commit-id: 779e85cc77
Former-commit-id: 9a268173ac [formerly 9a6ab8c52f] [formerly bf130d4e15490de77c6bbdbae09ac7d93618c08a [formerly bdf6d0b6be]]
Former-commit-id: 787bb8f6beeae504adb25f278d73dbfbb74159fb [formerly d7c31fe4a9]
Former-commit-id: 523cf536e2
2014-05-01 13:25:15 -05:00
Nate Jensen
b2b5727db3 Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
Former-commit-id: dba33e281e [formerly ba9ed2aba3] [formerly b7536a398b] [formerly dba33e281e [formerly ba9ed2aba3] [formerly b7536a398b] [formerly 96071c250d [formerly b7536a398b [formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]]]]
Former-commit-id: 96071c250d
Former-commit-id: c617423fd7 [formerly dbca36c2bc] [formerly 88095fd377297b348e1d0c64c9215b50da8eef27 [formerly 4c2923246a]]
Former-commit-id: f4c5590d3e741902d497b7b5cb7b21c8ccf1049b [formerly 704eff96aa]
Former-commit-id: 7c748842f0
2014-05-01 12:40:41 -05:00
Brian Clements
de694643a9 Issue #2903 changed commons.lang to match other unpacking foss
Former-commit-id: eae19ec5ca [formerly 93912625ea] [formerly 3ca4f8cc52] [formerly eae19ec5ca [formerly 93912625ea] [formerly 3ca4f8cc52] [formerly dd5412e119 [formerly 3ca4f8cc52 [formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]]]
Former-commit-id: dd5412e119
Former-commit-id: 8fc0feed89 [formerly 3fd504f1de] [formerly f6d182158a5782516e8b761f409c187bb4622b1d [formerly 2337d5ef56]]
Former-commit-id: e46f09623a9e504ef25b49b889bf64a2c46ca4bb [formerly c7cea4b5f7]
Former-commit-id: 36b2419ff1
2014-05-01 12:34:09 -05:00
Bryan Kowal
3ec47319cc Issue #3099 - handle empty location name lists in the data request
Former-commit-id: dfd5e3dbad [formerly ff21ef813c] [formerly 5eac78f0e0] [formerly dfd5e3dbad [formerly ff21ef813c] [formerly 5eac78f0e0] [formerly a9b9a8b8c4 [formerly 5eac78f0e0 [formerly 79603ec579d6ebcd1ef707f637e1b207ae18f803]]]]
Former-commit-id: a9b9a8b8c4
Former-commit-id: 5267bae3dd [formerly 4775dc1f40] [formerly 766f5d140cfb513aced9899ffa7b673d5595123d [formerly 2079aec2bb]]
Former-commit-id: e262c8f5f445fb2cdc7edc1447e80f9bd8e97f6e [formerly bf24af6980]
Former-commit-id: 10a57d5299
2014-05-01 12:12:42 -05:00
Nate Jensen
425fdb1674 Merge "Issue #2854: Reorganize deltaScripts" into omaha_14.3.1
Former-commit-id: b911f3e9b5 [formerly 1d157a16e3] [formerly 7fbdb9ff83] [formerly b911f3e9b5 [formerly 1d157a16e3] [formerly 7fbdb9ff83] [formerly bcb82bedc6 [formerly 7fbdb9ff83 [formerly a57a632a37cbee857a5f9fb8eb1f1cfa6a59a0b2]]]]
Former-commit-id: bcb82bedc6
Former-commit-id: 8ae67e0d7f [formerly 037fe502d7] [formerly 793328ce1c59c6fb48e922f66fcf2785e57bd487 [formerly e5eb1ab87e]]
Former-commit-id: acc622a694e300635d3d9dee8f541f47970622d0 [formerly 1b78d60b52]
Former-commit-id: 8961b7305e
2014-05-01 12:06:13 -05:00
Nate Jensen
f4102f6eaf Merge "Issue #3101 safe cast numpy shape values to Number" into omaha_14.3.1
Former-commit-id: 97ea9dd708 [formerly 03b412c136] [formerly b28e5291d6] [formerly 97ea9dd708 [formerly 03b412c136] [formerly b28e5291d6] [formerly 244183db25 [formerly b28e5291d6 [formerly c1dae5ae673d9db6d4c1b887b68b5cbaa815c6fa]]]]
Former-commit-id: 244183db25
Former-commit-id: c7610d0a3a [formerly 59623a97d0] [formerly d915e1041f3582440bb6f108021a9ffb531db781 [formerly 02059a512f]]
Former-commit-id: c6458474c0ccf717cf9ee4e52315c02b81f3edd3 [formerly 800ee1a68c]
Former-commit-id: 1f294864f0
2014-05-01 11:21:54 -05:00
Nate Jensen
7f6e325724 Issue #3101 safe cast numpy shape values to Number
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c

Former-commit-id: fc261ab303 [formerly 7b2ed421f0] [formerly 2a0775e748] [formerly fc261ab303 [formerly 7b2ed421f0] [formerly 2a0775e748] [formerly 76ad31501b [formerly 2a0775e748 [formerly 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb]]]]
Former-commit-id: 76ad31501b
Former-commit-id: 3634889dab [formerly ffb294cab4] [formerly cf11210c48f3e873f15155bc8644fb9af1296446 [formerly 191f6c3385]]
Former-commit-id: a264003449737f399c4846d23735afced10fd273 [formerly ee285cfc57]
Former-commit-id: 4669a93a96
2014-05-01 11:01:37 -05:00
Dave Hladky
800641027c Issue #2992 Missed perl script
Former-commit-id: f844c98853 [formerly 9a43ac36e6] [formerly 23433f628d] [formerly f844c98853 [formerly 9a43ac36e6] [formerly 23433f628d] [formerly 904a608495 [formerly 23433f628d [formerly b2c19dd8cfa3eee138f2b9abf7289d464d94ef46]]]]
Former-commit-id: 904a608495
Former-commit-id: 76c963b690 [formerly bc4067c5d8] [formerly d66d8ebcef31eae8a5b0eefbe03af2d980e7f476 [formerly dbe4f68100]]
Former-commit-id: 11e66bf207067369386858e6d5a550d4aa1e7161 [formerly 741e809c95]
Former-commit-id: a520e57f73
2014-05-01 08:48:38 -05:00