Commit graph

5115 commits

Author SHA1 Message Date
Ben Steffensmeier
bc38342841 Issue #2528 Fix display of data on somewhat identical projections.
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26

Former-commit-id: 94f0b52344 [formerly 2b30269ac9] [formerly 54a17c012d] [formerly 23694f5e0c [formerly 54a17c012d [formerly dfd408bdf6b4648ca9cd54fb12ed26f5ce8272aa]]]
Former-commit-id: 23694f5e0c
Former-commit-id: 9216d693916f99cccb2708677c47ef641c0cf7d1 [formerly bedf3cf45d]
Former-commit-id: be00537d6d
2014-02-13 13:27:32 -06:00
Ron Anderson
c2e56111c1 Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1
Former-commit-id: ce72867ab9 [formerly 21e95cc2f0] [formerly 51c9d27a39] [formerly 42fd9c8f9a [formerly 51c9d27a39 [formerly 10bbf4bf6e5be7ff8bb138113991f7292a3390b1]]]
Former-commit-id: 42fd9c8f9a
Former-commit-id: c5382d8fbd02ce98c80e76cb3bcd2d718cfc584a [formerly b84a83eb6f]
Former-commit-id: ca11555427
2014-02-13 10:46:27 -06:00
Ron Anderson
4d8ebf6712 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]
Former-commit-id: 2f067699f2
Former-commit-id: 3ebfa79176cc7f3e52da6c61f6bee73013042f0c [formerly 2d7c87ac84]
Former-commit-id: d9b82b4ebe
2014-02-13 10:10:34 -06:00
Brian Clements
d4afb01ecc Issue #2700 fixed subscribe request group input
user was being added to roster twice, the second time overwrote the group info
changed dialog to pass group info back so we only add once


Former-commit-id: a0eb8342bf [formerly 2d72c0f475] [formerly 37ddac11b88e84a017f079fd9dbf2ff4de856e68 [formerly 579f7c826d]] [formerly caa8360ac7 [formerly 579f7c826d [formerly 0c4a7915870f374cb4e728303939335cb0691c84]]]
Former-commit-id: caa8360ac7
Former-commit-id: 68affea48bc5b76e4b2afb6e939f8ab5903347db [formerly bafe2972a4]
Former-commit-id: 46ea69990d
2014-02-13 09:47:02 -06:00
Ben Steffensmeier
0bf76e4cd7 Issue #2672 Fix problems encountered in data access layer.
Former-commit-id: 5ed46c8b38 [formerly d663567b36] [formerly 41983df7a0] [formerly 835bcc695d [formerly 41983df7a0 [formerly ec95d1af0696b1f9b0b105143e26ea40937b28a8]]]
Former-commit-id: 835bcc695d
Former-commit-id: 79d48c0d792ff42c68382190a1ca74d1fb6c0908 [formerly d85014e363]
Former-commit-id: 8fb8ea57d5
2014-02-12 18:37:02 -06:00
Nate Jensen
906e7f679a Merge "Issue #2799 fixed double click chat not working for roster entries" into development
Former-commit-id: 1841c4f7bf [formerly ed87998c31] [formerly 6093312861] [formerly 94b8b7eb04 [formerly 6093312861 [formerly 381c3f6c6585f414c27b771168746f6dd838df0c]]]
Former-commit-id: 94b8b7eb04
Former-commit-id: 5a33efafe8dc13c6044be153e57d9a79150c60c2 [formerly b9e027059f]
Former-commit-id: f53e9523f3
2014-02-12 17:34:27 -06:00
Nate Jensen
23af1cfafc Merge "Issue #2648 Add AlertMessage output. Change-Id: I34818b15ce9a85c3b58b2475a0b1e94a596bf06e" into development
Former-commit-id: fe1e70c49f [formerly 28235a99cc] [formerly b79e5e02f9] [formerly fe139ac87f [formerly b79e5e02f9 [formerly 42e771181972a04c898c6fe30f8b1c6b70cedafd]]]
Former-commit-id: fe139ac87f
Former-commit-id: b3ea809ccc82b451e317b9bd5c8f2c29ce865f68 [formerly 8ee9d781a2]
Former-commit-id: 5c64b43c04
2014-02-12 17:34:15 -06:00
Ben Steffensmeier
325cc8f289 Issue #2648 Add AlertMessage output.
Change-Id: I34818b15ce9a85c3b58b2475a0b1e94a596bf06e

Former-commit-id: f910b9277c [formerly ca109598ec] [formerly f45ec64979] [formerly c96be7613c [formerly f45ec64979 [formerly 47826e8d3e4570c9f970fc30f5dac462611b91bf]]]
Former-commit-id: c96be7613c
Former-commit-id: c0cfb61f8fb09bae1bcec3cb6646ccc305150c1a [formerly 4cffeac65f]
Former-commit-id: 91eaba54df
2014-02-12 17:08:23 -06:00
Brian Clements
0145571fe4 Issue #2799 fixed double click chat not working for roster entries
Former-commit-id: 2a687e7ac5 [formerly 1e19c8d62c] [formerly 1bf3a09056] [formerly 9d7490a158 [formerly 1bf3a09056 [formerly 06cfbcccff89fd79efd3188c45653dce160fc90a]]]
Former-commit-id: 9d7490a158
Former-commit-id: 4759fd1ad623c2d68120a23d29513e3f9b15ecd5 [formerly f22268295e]
Former-commit-id: 667a1450cf
2014-02-12 17:06:44 -06:00
Brian Clements
c322557870 Issue #2797 fixed presence bug
a defensive copy was needed when sending presence to rooms


Former-commit-id: b8a1c8f56d [formerly 22031aa87d] [formerly e8e7266485faec2bbaf78f83c8f61a13d35e97aa [formerly 81ddf87b04]] [formerly 23e2039028 [formerly 81ddf87b04 [formerly d0dab4bce76b45b71f4238d5a04c440cee936eaf]]]
Former-commit-id: 23e2039028
Former-commit-id: 545e96ec3fe21915f537c29fda28717077dc6a48 [formerly 09859bdee9]
Former-commit-id: a1ba9c6b9d
2014-02-12 16:54:46 -06:00
Richard Peter
9709f881bf Merge "Issue #2655 fix textlightning distribution regex" into development
Former-commit-id: 6611c70839 [formerly 172f0a9fa4] [formerly 70e9bef750] [formerly 3feee2cf50 [formerly 70e9bef750 [formerly b1ba10c3b69187b762c962801a937adeb6ef5867]]]
Former-commit-id: 3feee2cf50
Former-commit-id: 450dcd5eb62fde046f4116dff0528b7a55567591 [formerly ca851b6d2e]
Former-commit-id: 9d183aaa97
2014-02-12 15:34:43 -06:00
Nate Jensen
fc4670578b Merge "Issue #2793 improved error handling for packet extension" into development
Former-commit-id: 1bf941fc58 [formerly fa42c40bc7] [formerly eec72c5956] [formerly 5e6656581b [formerly eec72c5956 [formerly 3ccf0beb3b0cf77c168b529d69f291b8c295cbb1]]]
Former-commit-id: 5e6656581b
Former-commit-id: 9b1e3e2f48824cf85d17412f8baa7fdfe44e00c1 [formerly 7247d69202]
Former-commit-id: bac84c698f
2014-02-12 15:06:43 -06:00
Nate Jensen
31fed91d11 Issue #2655 fix textlightning distribution regex
Change-Id: Ia8900e8baa05d831c984fbf355034ca189364d99

Former-commit-id: 2cd9b9ef13 [formerly cf1dcae597] [formerly a6c562d3f0] [formerly 16d6a29bb9 [formerly a6c562d3f0 [formerly 48825cb03da5bde6f8b1252fe2e366119535f8f3]]]
Former-commit-id: 16d6a29bb9
Former-commit-id: a4537d42ffe3e0752006e8f23e4ef3cfdcdc8f60 [formerly 3b918cee5f]
Former-commit-id: 929d683210
2014-02-12 15:03:45 -06:00
Brian Clements
85e92777e3 Issue #2793 improved error handling for packet extension
any exception thrown while parsing packets disconnects stream
changed to logging parsing problems and returning empty payload so we stay connected
added null check when sending to topic


Former-commit-id: 87a7bf82e5 [formerly 3034ac5994] [formerly e381edcd60] [formerly b0714ba659 [formerly e381edcd60 [formerly 808727ce287116be8c8e2a93ce0fc4b3a996c0ef]]]
Former-commit-id: b0714ba659
Former-commit-id: 58c131b889ec791b70c5c89334b864ea89665943 [formerly 4406477877]
Former-commit-id: b94bc84429
2014-02-12 14:22:33 -06:00
Lee Venable
c17a417cbe Issue #2773 - added code to help prevent eclipse bug from occurring.
Former-commit-id: 328aebb4a6 [formerly 8073fd22b1] [formerly 7099472204] [formerly ce08022db7 [formerly 7099472204 [formerly 7b3700b5ad07c677755844f969b5c31f31be138b]]]
Former-commit-id: ce08022db7
Former-commit-id: 1b4a9c2bf36e763585bfbc84e3a5a6ce5dbd03e0 [formerly c74ae6b83d]
Former-commit-id: a7302a3232
2014-02-12 13:47:20 -06:00
Brian Clements
8b275e94b2 Issue #2699 require non blank handle
previously defaulted to userid if handle left blank
now reprompts for handle
preferences now default to userid to pre-fill handle


Former-commit-id: 88db377b41 [formerly 8f07ae2a42] [formerly 0765451a9d] [formerly ddf5b2a3ef [formerly 0765451a9d [formerly ae5f2d2b547241e7ba9c22aabaf64fceceb1b563]]]
Former-commit-id: ddf5b2a3ef
Former-commit-id: f1871690aa5457b126ba46efaeed7a47b128ed69 [formerly fab4fea177]
Former-commit-id: 9c67bcbbcf
2014-02-12 09:13:48 -06:00
Ron Anderson
e0403fd81d Merge "Issue #2719 Update NHA GFE domain" into omaha_14.2.1
Former-commit-id: cf7281ba3c [formerly 8ba331e7fb] [formerly af4f8de839] [formerly d906b780e8 [formerly af4f8de839 [formerly caf31f2a88227c7ed9141676feb937822f4d03ce]]]
Former-commit-id: d906b780e8
Former-commit-id: 33d7dc6d66fee245851700ef94b840f31e915bc0 [formerly 361881dfda]
Former-commit-id: 2fdcef7338
2014-02-11 17:16:07 -06:00
Ron Anderson
07fdb410c6 Issue #2719 Update NHA GFE domain
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c

Former-commit-id: 0b73d0703e [formerly 0f9b44ff94] [formerly a665530831] [formerly ee89463d27 [formerly a665530831 [formerly 28008b46b5d68e544dace5f721b283c222701699]]]
Former-commit-id: ee89463d27
Former-commit-id: 92ba98108868529a68af7962661c0c08a1eade14 [formerly bfa65ed39e]
Former-commit-id: 1ca9c95567
2014-02-11 17:07:01 -06:00
Brian.Dyke
1c7bf39f73 14.1.1-18 baseline
Former-commit-id: 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1d6a9456b7 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: 57fbd21c8831f46d66fe301b77916657b0ab9f05 [formerly c5857c30f2]
Former-commit-id: d61ae6c5f4
2014-02-11 15:52:50 -05:00
Slav Korolev
b2d7b314d4 Issue #2763. Made LFCR correction of input data.
Former-commit-id: d715fc58dc [formerly 633a33dd21] [formerly 43802c3a5f] [formerly 47fc09a684 [formerly 43802c3a5f [formerly ea2d524767ea5eef74cda5fa5fbff886da1d3bc9]]]
Former-commit-id: 47fc09a684
Former-commit-id: b95a9391756e1f2a8fcfd1f7948aee953988e1d7 [formerly 239f37f467]
Former-commit-id: 293af25a13
2014-02-11 14:48:07 -05:00
Ben Steffensmeier
be4d0f1c88 Issue #2765 Fix aliases for probability parameters.
Former-commit-id: 89d47e3243 [formerly 2952ae37a6] [formerly 43a8b80ef2] [formerly 0bb18f2cd7 [formerly 43a8b80ef2 [formerly 11bbfb8275cfafb411d1d5d9732b021f0011712a]]]
Former-commit-id: 0bb18f2cd7
Former-commit-id: 63b3cde2a263f269c8044495d613aae2f31b7980 [formerly eb9c4ef999]
Former-commit-id: c0dbdb9906
2014-02-11 11:35:03 -06:00
Lee Venable
f8ae04bce2 Merge "Issue #2704 smarter thin client connectivity dialog and connection checking" into omaha_14.2.1
Former-commit-id: 6773d174ec [formerly c7cfd49622] [formerly 5c256dc19c] [formerly f078971b5d [formerly 5c256dc19c [formerly c75877624ab414c1a45bc7326c49aa99c8ec3021]]]
Former-commit-id: f078971b5d
Former-commit-id: fb3d041cae5b972726c8f92403f7ef7c6570c7bf [formerly 42fdfa4964]
Former-commit-id: ab6fab4199
2014-02-11 09:15:44 -06:00
Ben Steffensmeier
aa9542cf3f Issue #2672 Allow One extra null byte in RemoteRequestRouteWrapper.
Former-commit-id: 6d4e5d79de [formerly 3bc210a1f1] [formerly 3d08979eee] [formerly 40bc9df420 [formerly 3d08979eee [formerly 7463bf7c3efbdf8eb184f24bfc9c6a12c57d5006]]]
Former-commit-id: 40bc9df420
Former-commit-id: 889387acc295602e9c38f3f464ee1b9a2ae3734c [formerly a0227d2c4e]
Former-commit-id: 01c4ce8e29
2014-02-10 17:39:32 -06:00
Nate Jensen
1dcb3a77c3 Issue #2704 smarter thin client connectivity dialog and connection
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: 24bbf4949d [formerly c28085118f] [formerly 75ca70fba6] [formerly fd43d9e095 [formerly 75ca70fba6 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]]
Former-commit-id: fd43d9e095
Former-commit-id: d828ad996a7bd8eb159d4cd60c7b851fc8ac8486 [formerly 2111989497]
Former-commit-id: c0256ac19e
2014-02-10 16:48:29 -06:00
Max Schenkelberg
8ddc6b95e4 Issue #2680 fixed samplers in structs issues with GLSL spec.
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9

Former-commit-id: 7de6ff30da [formerly 3c1fafe328] [formerly 7822511754] [formerly a8a67634f9 [formerly 7822511754 [formerly 4f3635fc682c2a1746e188dac0f371676c9e0be9]]]
Former-commit-id: a8a67634f9
Former-commit-id: a6667b70df86f17d8dea3939535e720a8767c67d [formerly e2e9eaaf35]
Former-commit-id: dd872433c7
2014-02-10 13:43:16 -06:00
Lee Venable
e9e5667274 Merge "Issue #2453 - Notification Center refactor" into omaha_14.2.1
Former-commit-id: b90abb03c1 [formerly d6fa79f1a7] [formerly 27be4297e6] [formerly 88a9d20316 [formerly 27be4297e6 [formerly 213ecfda92272947cda51d9c3d00b117a3d52a76]]]
Former-commit-id: 88a9d20316
Former-commit-id: e7218f6aecd2d4898858f31ff591b76d092b3d14 [formerly d975dcf01e]
Former-commit-id: 65e6fa1963
2014-02-10 11:50:07 -06:00
Nate Jensen
3bbd2ecd54 Merge "Issue #2778 fix bug in JUtilHandler.py where size was None. Also made the registrations an OrderedDict for falling back so we can order how we fall back" into development
Former-commit-id: c6b13c6ddb [formerly 9f2d49e31d] [formerly b1fc25a2fd544abe2595187fe14f13adb72d76d0 [formerly 93c84e2f95]] [formerly 06679bbd46 [formerly 93c84e2f95 [formerly 30172e9189354a7be4581dfcf8c519dfdf7b8e8e]]]
Former-commit-id: 06679bbd46
Former-commit-id: ae1bcab5faf9f4ae8ebf24fd40ab993480168286 [formerly 733c21051c]
Former-commit-id: 3de470ba73
2014-02-10 11:26:10 -06:00
Nate Jensen
c65669a6bf Merge "Issue #2211 Fix data mapped sampling." into omaha_14.2.1
Former-commit-id: fb8ce8da65 [formerly d16d679809] [formerly 5c7c14a6c4] [formerly a48c1c6783 [formerly 5c7c14a6c4 [formerly 1ae3057ce4fbbb5e60b27cf21d75de72b7e00c3e]]]
Former-commit-id: a48c1c6783
Former-commit-id: 56b6cef3203d3700e7f7c9be8f7525f5d508e9c2 [formerly 57aa678883]
Former-commit-id: 3047063c6e
2014-02-10 09:53:41 -06:00
Matt Nash
f2831d38e9 Issue #2778 fix bug in JUtilHandler.py where size was None. Also made the registrations an OrderedDict for falling back so we can order how we fall back
Change-Id: I31120de5d206ddcade83e2c5455742deb1d6598a

Former-commit-id: dca4590a15 [formerly dccb819738] [formerly 4252e58992] [formerly 1ecc4541cf [formerly 4252e58992 [formerly a1ca74f1b2ad0176ab38e4a41bb7df62e06cc0c1]]]
Former-commit-id: 1ecc4541cf
Former-commit-id: cd7ef6447954cfe5ef0495e81b84971fffcd7f8a [formerly f300282a22]
Former-commit-id: 5ce022cc1e
2014-02-10 08:40:25 -06:00
Ron Anderson
bbd44e89ba Merge "Issue #2509: Fix baseline merge breakage to ifpIMAGE." into omaha_14.2.1
Former-commit-id: 40f316bcf8 [formerly 42850542af] [formerly 2170fb5615] [formerly 0476a288db [formerly 2170fb5615 [formerly ec8c9e963137ec7b7201558c5ddd00d2affb3aa3]]]
Former-commit-id: 0476a288db
Former-commit-id: ab1744ee16b0c46f3fb2df37d047c16d38148eab [formerly 3cb44b9a12]
Former-commit-id: 9e775c7d28
2014-02-10 08:31:31 -06:00
Mike Duff
b62abd4219 Issue #2453 - Notification Center refactor
Former-commit-id: c20018d0ba [formerly 61c57d2254] [formerly 4930caf5c544c2701961871a776e6178c7f94843 [formerly eeb78f7f20]] [formerly 2c9d603e50 [formerly eeb78f7f20 [formerly f570a3945ad8e9e8bc4f88989a0ec10da191856a]]]
Former-commit-id: 2c9d603e50
Former-commit-id: 54e4296d2e02deec8772b1aa27026f2486ecd7da [formerly 4a87525df0]
Former-commit-id: 7535b51fe7
2014-02-07 16:50:50 -06:00
Ben Steffensmeier
7f8ff5efc0 Issue #2211 Fix data mapped sampling.
Former-commit-id: e7baa5b186 [formerly d219a687c9] [formerly 724bb85676] [formerly 3d76d6655b [formerly 724bb85676 [formerly aec317f506eb940e843a0c3cf4ffa55a83eb186b]]]
Former-commit-id: 3d76d6655b
Former-commit-id: 6fc70ed6daf823669783c4000e189cbb10a17f8d [formerly 6a95dd6242]
Former-commit-id: a37a910f67
2014-02-07 13:00:00 -06:00
Brian Clements
0dd73fed5a Issue #2699 removed over cautious handle validation
xmpp does not limit the characters that can go in a handle
fixed id from room parsing to account for special characters


Former-commit-id: 6c6467d235 [formerly 639f774567] [formerly 7d6e116b9f] [formerly 6518b88fe5 [formerly 7d6e116b9f [formerly 24343a796d0089824dde2f7039cdf93ed0ebf88c]]]
Former-commit-id: 6518b88fe5
Former-commit-id: 8705994ebee4fa744b73413cf439e077ecb61c30 [formerly 8742be3a13]
Former-commit-id: 6efb4f51d2
2014-02-07 10:06:06 -06:00
David Gillingham
8cdf1ce158 Issue #2509: Fix baseline merge breakage to ifpIMAGE.
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00

Former-commit-id: dc8f0dde25 [formerly b12e29dd7c] [formerly 03d36b8309] [formerly e8ffc73893 [formerly 03d36b8309 [formerly 19e9a7f37409e37b378bf2f3eae0b9b16d797f65]]]
Former-commit-id: e8ffc73893
Former-commit-id: bcf359e669db6d450eb89b007e4262c8f81e5b91 [formerly 94ec272ab2]
Former-commit-id: ad8c40032f
2014-02-07 09:51:42 -06:00
Brad Gonzales
e57abad188 Issue #2636 Changed EdexBandwidthManager startup scheduling to use the
in-memory bandwidth manager to setup initial scheduling because it
is much faster.

Amend: updated log statement.
       fix for rescheduling of already scheduled BandwidthAllocations.

Change-Id: I5c6d6543bce8222cb746fde2951caf6439db5fa3

Former-commit-id: c275da6725 [formerly 9529c1d191] [formerly 9c50fb29fd] [formerly 704e466f28 [formerly 9c50fb29fd [formerly f1a4a7b24290b6e85380668563793ac529fc5b31]]]
Former-commit-id: 704e466f28
Former-commit-id: fce69a5a63e582579ba583e885690b5aed2ab58f [formerly 0b211e8036]
Former-commit-id: b59278f73f
2014-02-07 09:35:36 -06:00
Ben Steffensmeier
b4cf53d154 Issue #2672 Handle envelopes in data access requests of points and lightning.
Change-Id: Id9a56e9f8027a2f489561c241e2f34dd92dce400

Former-commit-id: dad7e3cbcd [formerly cd772d8961] [formerly 25ad0e327c] [formerly ec8514000f [formerly 25ad0e327c [formerly efe32c8302834b1c53a5f65850aff8f12437d3bb]]]
Former-commit-id: ec8514000f
Former-commit-id: 3257bc02c61d603531e293f1b4a6de5a7e06614c [formerly 19cb907ac8]
Former-commit-id: b28f945bc1
2014-02-06 14:04:14 -06:00
Ben Steffensmeier
7954587c40 Issue #2762 Fix Satellite Data Access.
Former-commit-id: 89105e1257 [formerly a26a150a69] [formerly 2166b5b696] [formerly ed2c1a0329 [formerly 2166b5b696 [formerly 4016e9366e8917225777b079da4b94dd1e6fde4a]]]
Former-commit-id: ed2c1a0329
Former-commit-id: 7fbc07009858ae2446c648b08c7b4a17103a905c [formerly e7662de8db]
Former-commit-id: 270433f5f3
2014-02-06 13:53:44 -06:00
Ben Steffensmeier
955df80a07 Issue #2672 Fix serialization of jts envelopes.
Former-commit-id: abb8ce22a7 [formerly fc783a8e6e] [formerly 97eef922ef] [formerly a068650e43 [formerly 97eef922ef [formerly 42b0e215a3e2bfe4ca8d789f025c49d8f35f6a6c]]]
Former-commit-id: a068650e43
Former-commit-id: 7bec18ddec236a2959cfdac1ea4a19dee06b5284 [formerly 43df5b25d9]
Former-commit-id: 1cee24ce50
2014-02-06 11:27:07 -06:00
Mike Duff
a63fdead0c Issue #2636 - Fix for ncf spring config
Former-commit-id: e69e8c4615 [formerly 3707a4eabd] [formerly 3f7defe563] [formerly e84ae26421 [formerly 3f7defe563 [formerly 4308e8a45d61e9d6a67b6036e98ff1b8886d86f6]]]
Former-commit-id: e84ae26421
Former-commit-id: d951ae7e0460f11e17e732248e01e37ce6a521fa [formerly 6210a6aa18]
Former-commit-id: 9ec273fdcc
2014-02-06 09:29:20 -06:00
Richard Peter
5a7e7af23b Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
Former-commit-id: 8ad3c5857b [formerly 82fc0a2ed3] [formerly 64f0cabaef] [formerly 36d3d21b57 [formerly 64f0cabaef [formerly daacb19de029a15f94338c84a85116d0435f79be]]]
Former-commit-id: 36d3d21b57
Former-commit-id: 15e05c73cb80bc97c2edc96c60ee1065b9f736b4 [formerly c965993d17]
Former-commit-id: c3c1205848
2014-02-05 18:20:36 -06:00
Nate Jensen
73c1a1141d Merge "Issue #2672 Handle envelopes in data access requests of gridded types. Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c" into development
Former-commit-id: 6b9561855b [formerly d3d0dc5f77] [formerly d863bf208c] [formerly f00d4c54d8 [formerly d863bf208c [formerly 94cf3a44a8c2942c09e8fa596f734f3a0047d37a]]]
Former-commit-id: f00d4c54d8
Former-commit-id: d6bdb302ebbfaa5697bf26f7e3500a04f2afb0ee [formerly 8feed9aadf]
Former-commit-id: 39c9dda92b
2014-02-05 17:09:17 -06:00
Mike Duff
229efa7c5b Issue #2677 - Don't do overlap checks when updating subs to deactivated.
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd

Former-commit-id: 3691146e34 [formerly bafe19bbd5] [formerly 101c08818d] [formerly 6b01c2957f [formerly 101c08818d [formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]]]
Former-commit-id: 6b01c2957f
Former-commit-id: c5c924842a196e06e1a50bd0c39e0bc05f4fb139 [formerly 6a2f75e8d5]
Former-commit-id: 9edf591218
2014-02-05 16:08:01 -06:00
Ben Steffensmeier
3a13cfcb78 Issue #2672 Handle envelopes in data access requests of gridded types.
Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c

Former-commit-id: f3eebf56f5 [formerly b84bf8c891] [formerly 9c439866d5] [formerly dc5b5526a3 [formerly 9c439866d5 [formerly f634fe40e6fa7a8a3af575e79cb3d996761db983]]]
Former-commit-id: dc5b5526a3
Former-commit-id: 30d66ecdaa170e8c1d59f0f680338dc3d3185bbd [formerly 02a0874646]
Former-commit-id: 5b7cf3caec
2014-02-05 15:57:08 -06:00
Richard Peter
f4e9afceee Merge "Issue #2722 - Add auto refresh to sub manager dialog" into omaha_14.2.1
Former-commit-id: 0ebd0009e5 [formerly d1546d42ce] [formerly 7e69f192a5] [formerly 882544fec5 [formerly 7e69f192a5 [formerly 1e91683c1df918a7405c2f847a6dc7397dbcc473]]]
Former-commit-id: 882544fec5
Former-commit-id: 29ff8293b807402f79b124b428ec48ebeb5fb99e [formerly 945bcd895c]
Former-commit-id: 963fb37e6c
2014-02-05 14:57:16 -06:00
Dave Hladky
14f2c99e46 Issue #2686 Refactor of retrieval
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558

Former-commit-id: 1c8f6fb36d [formerly 7fb7e10cda] [formerly 6172c83afc] [formerly 39f97723d6 [formerly 6172c83afc [formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]]]
Former-commit-id: 39f97723d6
Former-commit-id: d5d37d7b55d86fa82a363075d901e0a1583e45de [formerly 2b998409f5]
Former-commit-id: 39f5579103
2014-02-05 14:49:26 -06:00
Steve Harris
d8f7d14d95 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 66e76b7de6 [formerly 1dbc316078] [formerly f24bc49703] [formerly 74c87b95c3 [formerly f24bc49703 [formerly cee2e11f4b3d74bee3ab254267f156a846801087]]]
Former-commit-id: 74c87b95c3
Former-commit-id: b16ae4f42a3b6d0b7ffd0b0b6cace39fdfd151b8 [formerly ab294b7652]
Former-commit-id: 4cab7709ec
2014-02-05 09:12:40 -06:00
Richard Peter
0c66686f19 Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1
Former-commit-id: 176bee122b [formerly 21b0a87d78] [formerly 8f844bc9ce] [formerly e5af004993 [formerly 8f844bc9ce [formerly a2536c180f68e5ea970e3406e3ef1f899650f3e2]]]
Former-commit-id: e5af004993
Former-commit-id: 221df5c8f19958cdb7f96c8c47eb4903283decbe [formerly 4309c55a5f]
Former-commit-id: d3f13fc4c7
2014-02-04 18:12:48 -06:00
Brian.Dyke
896375c47b Issue #224
Former-commit-id: cd80c22b5c [formerly ed476a583f] [formerly 3f86a80d7e] [formerly dad6f2896b [formerly 3f86a80d7e [formerly 043faa447b4fc15a996dfe6108093bed5f1b6497]]]
Former-commit-id: dad6f2896b
Former-commit-id: 70f7b0213878f981680926bd20a81de54dadf205 [formerly 610cf76a29]
Former-commit-id: 17e3464377
2014-02-04 17:05:12 -05:00
Brian.Dyke
d274021768 Issue #124
Former-commit-id: 6d35a4b1bc [formerly 3ba93b175e] [formerly 439f053309] [formerly 0cc11ddfd3 [formerly 439f053309 [formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]]]
Former-commit-id: 0cc11ddfd3
Former-commit-id: 1e605ca4a47aef453131de36960bb5a057128099 [formerly 90b4e7ebf0]
Former-commit-id: e1d788683d
2014-02-04 16:56:47 -05:00
Brian.Dyke
9ec4a820d2 Issue #179
Former-commit-id: ea0a5bebfd [formerly 6b3ebc4fef] [formerly a0626cdc00] [formerly b23c6f59f7 [formerly a0626cdc00 [formerly d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9]]]
Former-commit-id: b23c6f59f7
Former-commit-id: 8058c8a62e584fe650039e4e4c28cf04d7762dbc [formerly 6d58d8c016]
Former-commit-id: 2955d5c9f0
2014-02-04 16:53:34 -05:00