Commit graph

4512 commits

Author SHA1 Message Date
Dave Hladky
bce3a2586d Issue #2710 Made MADIS window larger.
Former-commit-id: 75126014a8 [formerly 37ccd1d80d] [formerly edb07269a9] [formerly 0094857d34 [formerly edb07269a9 [formerly eddd50a0575d140eb05999889940a632f319438c]]]
Former-commit-id: 0094857d34
Former-commit-id: 5a4db359f5f43760060f417d9ef60328efa960e2 [formerly 78e3974527]
Former-commit-id: b225690c65
2014-01-20 12:04:08 -06:00
Lee Venable
80f7874733 Merge "Issue #2459 - Add unscheduled as a slot attribute" into omaha_14.2.1
Former-commit-id: ad8125bdfc [formerly c4fd162842] [formerly f599d2582f] [formerly 8c993338bb [formerly f599d2582f [formerly 1f8e60301301e4be3186ce09e569e7117a350a6d]]]
Former-commit-id: 8c993338bb
Former-commit-id: a80a249535a0ac50d506b7844b830a62dd6df906 [formerly ce4b2e6941]
Former-commit-id: e45d202e2c
2014-01-16 10:22:47 -06:00
Mike Duff
39e90e653e Issue #2459 - Add unscheduled as a slot attribute
Former-commit-id: 1078c7dbec [formerly 292ef2c068] [formerly 0f655c96e3] [formerly 47069bd7a4 [formerly 0f655c96e3 [formerly 4cd670bc12e09f1acc778e8760615e92561e3ce3]]]
Former-commit-id: 47069bd7a4
Former-commit-id: 326fbca95107e72aaa00b4cf88c3bd1d1eafe3f5 [formerly fe012ebbd1]
Former-commit-id: 7fe25d02f0
2014-01-16 10:06:17 -06:00
Dave Hladky
2761f0990e Issue #2613 StandardCharsets NIO dependency removed.
Change-Id: I7ba841e1f1e480561d3c7302e8b00ecfaab41f24

Former-commit-id: 2776bd1921 [formerly 0429acfb81] [formerly c342681a0b] [formerly 33aeec0cb4 [formerly c342681a0b [formerly a9e1fbf4f19beecc2935cb992380f27cb2298ddb]]]
Former-commit-id: 33aeec0cb4
Former-commit-id: 2594df8a99fa587512baac7f53dd244f40810b3b [formerly f7b5ce629a]
Former-commit-id: ae3293f065
2014-01-16 09:21:35 -06:00
Nate Jensen
c13725a611 Merge "Issue #2613 Registry peformance enhancements -- Added indexes to registry tables -- Better cleanup when a registry leaves the federation -- Batching of queries in notification handler to reduce number of web service calls -- Added Hibernate flushes and clears to better manage memory" into omaha_14.2.1
Former-commit-id: e4c443a157 [formerly f9d85e4354] [formerly a8de0766f4] [formerly 190a54707d [formerly a8de0766f4 [formerly ebfeb3ae2cd6fa1f00bc4f7a0955f11afe2ff8ef]]]
Former-commit-id: 190a54707d
Former-commit-id: c82146d0500d3753cc9d4807dce7d0bc0d4a0e2f [formerly 396d71b2fc]
Former-commit-id: bab38cc635
2014-01-15 17:36:52 -06:00
Nate Jensen
9f4360fdda Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
Former-commit-id: 26ce19331e [formerly 9028260386] [formerly ae10129713] [formerly 9d529b3b21 [formerly ae10129713 [formerly 61b073cef0bfe65634096221d8ee8aef37f9e1ed]]]
Former-commit-id: 9d529b3b21
Former-commit-id: 194b6af74ffb08201bff51fb4de3ff2d6d3448d9 [formerly 1be41d69c6]
Former-commit-id: 98e1bf9194
2014-01-15 17:36:30 -06:00
Nate Jensen
e2cb8736eb Merge "Issue #2678 Fix for multiple threads grabbing a retrieval for processing." into omaha_14.2.1
Former-commit-id: cf41524e58 [formerly 89163b6e3b] [formerly d682bcee93] [formerly b90000df3e [formerly d682bcee93 [formerly 81e57beaa231d696b7d40d6afbda365a27f6cae8]]]
Former-commit-id: b90000df3e
Former-commit-id: 13f722aa655cb8a30c62b40199a58878499ed6f9 [formerly 4999c205d7]
Former-commit-id: 193825115d
2014-01-15 17:36:11 -06:00
Nate Jensen
e7a70cc67c Merge "Issue #2693 Data set information infrastructure for availability offset calculations Change-Id: I0f8d90a753ce37d37c682ff17613eb9a44554a3b" into omaha_14.2.1
Former-commit-id: f133f655fc [formerly 173fef3b10] [formerly a2b3f44767] [formerly 1b3da1eabf [formerly a2b3f44767 [formerly b705f3dbee5a8f59501b11245bb99ce86338d835]]]
Former-commit-id: 1b3da1eabf
Former-commit-id: 7f004990ff870ea9bbc5ebd4f2574d78fb0888db [formerly c2ce5a2efc]
Former-commit-id: 1bd8accfec
2014-01-15 17:18:55 -06:00
Brad Gonzales
26c902d957 Issue #2678 Fix for multiple threads grabbing a retrieval for processing.
Change-Id: I1e982d4db4d4f68531b8b9c65e7070bff3825c28

Former-commit-id: dd09d84c73 [formerly a2fbcecef6] [formerly 3e3fcfa9af] [formerly 46a2a5f70f [formerly 3e3fcfa9af [formerly 3d396223b93631f0ea561a4df8ae9a3d71dde767]]]
Former-commit-id: 46a2a5f70f
Former-commit-id: 4a9c736666cc3f62be99481509da930add8b7094 [formerly a1429a3911]
Former-commit-id: 7e608842b2
2014-01-15 17:16:47 -06:00
Dave Hladky
a9f5f0f2fc Issue #2693 Data set information infrastructure for availability offset calculations
Change-Id: I0f8d90a753ce37d37c682ff17613eb9a44554a3b

Former-commit-id: f475d7a4f5 [formerly ef8eb701da] [formerly 129163bf87] [formerly b64df5806a [formerly 129163bf87 [formerly 48fad391deb95616556628424b1a1799c2929f89]]]
Former-commit-id: b64df5806a
Former-commit-id: 81305e5fd1fcdcf93a77c94b2129a10a7a8a8e7b [formerly 682b06c89d]
Former-commit-id: c05cbb5337
2014-01-15 17:08:03 -06:00
Ron Anderson
c2c4142235 Issue #1571 Fix bug in GFE where DbId in ParmId did not match the Database.
Change-Id: I08b5ec1dbbf95d269c9f1ad7fb5e02a8a471b7ec

Former-commit-id: fe81181bf1 [formerly a656439fb2] [formerly 46f00786ed] [formerly fae5283358 [formerly 46f00786ed [formerly c03aacd100a73d84d96bfcd3db447597f478fcb7]]]
Former-commit-id: fae5283358
Former-commit-id: cc91b608d397b8f1c96faf04a7964719df9bec04 [formerly 151cb21153]
Former-commit-id: 4f4f4996be
2014-01-15 16:16:44 -06:00
Benjamin Phillippe
a41530f2df Issue #2613 Registry peformance enhancements
-- Added indexes to registry tables
            -- Better cleanup when a registry leaves the federation
            -- Batching of queries in notification handler to reduce number of web service calls
            -- Added Hibernate flushes and clears to better manage memory

Change-Id: I88ec580694d2104458391a798667748c88f16dd0

Former-commit-id: 2efe31b5ee [formerly c3e9724e7e] [formerly fd30caddb0] [formerly 83bec75737 [formerly fd30caddb0 [formerly 4344ffec77286a531b9be29e9ef94acd9c6ce342]]]
Former-commit-id: 83bec75737
Former-commit-id: c781dab1bf9255a5669e2875c5a75bee4165d557 [formerly 59d5644742]
Former-commit-id: 70446e302e
2014-01-15 16:09:13 -06:00
Nate Jensen
472cf2905c Issue #2359 printout connection exceptions to aid in diagnosing
connectivity problems

Change-Id: I957abb82cd3a736485f289a266b00cdbd89a578c

Former-commit-id: aa0639a878 [formerly ccaa9dbde1] [formerly fc6b31c1c0] [formerly 5f39322d59 [formerly fc6b31c1c0 [formerly 8d7445a4ba4b76335166569de32c00bac1a2a84b]]]
Former-commit-id: 5f39322d59
Former-commit-id: 6ed8c7d69c73010ecba0450f2c9d1203bc9f3ab4 [formerly deb57e3b35]
Former-commit-id: 4533642f26
2014-01-15 13:39:28 -06:00
Greg Armendariz
081ef4ec88 Merge "Issue #2581 fix local storm report delta script and unique constraint" into omaha_14.2.1
Former-commit-id: 821fc0f0b9 [formerly fdc1dc7c96] [formerly de50d0a94b] [formerly b94974cc4f [formerly de50d0a94b [formerly c4ab4e248ec4b3de0bde9995812aa2b052a2b8db]]]
Former-commit-id: b94974cc4f
Former-commit-id: db30a5f496e316b98ee66fd212ea7cbb4efc3eb0 [formerly f120539ced]
Former-commit-id: 85914092c9
2014-01-15 11:16:26 -06:00
Dave Hladky
5cc337003a Issue #2679 Multiple regions for a single collector mapped to single WFS source
Change-Id: I1e4b1eefe5f507742805886292ba67b24f40f34c

Former-commit-id: bdaf00a48a [formerly eddceed756] [formerly 08625addba] [formerly c57c27c843 [formerly 08625addba [formerly b888d311923ba0628fa015018ef2f62fce47fb43]]]
Former-commit-id: c57c27c843
Former-commit-id: edd648771874f35130649ae7bc594cfa8f6feda0 [formerly 6069bb90c7]
Former-commit-id: 9d136bb7d8
2014-01-15 10:05:20 -06:00
Nate Jensen
f58034617d Issue #2581 fix local storm report delta script and unique constraint
Change-Id: I421aed1572c10c80a592381c849d85eac8d1e809

Former-commit-id: 16d01f1ca7 [formerly 562e85e45b] [formerly e6feb413f7] [formerly 059e057cdb [formerly e6feb413f7 [formerly 88918268a6d72d35dd2f19be09fbb429851fe46b]]]
Former-commit-id: 059e057cdb
Former-commit-id: eb6b4892671bdfa9f3570ac483b6bc6a075ba84b [formerly bc2f099cc6]
Former-commit-id: d4236a7fc0
2014-01-15 09:50:35 -06:00
Mike Duff
c5f28e0f37 Issue #2459 - Refactor the subscription status
Former-commit-id: 43810aa5f5 [formerly d03c012a54] [formerly f94593867e] [formerly 245d76358e [formerly f94593867e [formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]]]
Former-commit-id: 245d76358e
Former-commit-id: ebd7027d07dcf26d5e0b30ecd0d661a72afa18e1 [formerly d96a9d2937]
Former-commit-id: 9a45b95db6
2014-01-15 09:21:30 -06:00
Dave Hladky
c2bb3ee199 Issue #2692 Fixed non-notification of adhoc's due to incorrect lookup of subscription.
Former-commit-id: 19cbf638a6 [formerly 56b0f4274d] [formerly fee9c183f9] [formerly 8a6a386410 [formerly fee9c183f9 [formerly 339245a534bf2da5071536e959086d5e4f7b2bf0]]]
Former-commit-id: 8a6a386410
Former-commit-id: a001b689127d9b92213eb6050018ef7a8258e0a4 [formerly 79e5b19f31]
Former-commit-id: 5cf9c5bd1c
2014-01-14 15:29:15 -06:00
Nate Jensen
e88fd9b8c5 Issue #2581 improve LSR error handling because there was yet another
event type missing

Change-Id: I954d408ecfcfda14f3856f4afc7c04e7ef8148be

Former-commit-id: 85d8f6de32 [formerly 738f97cab1] [formerly eb96c396c2] [formerly b6a21ccb7c [formerly eb96c396c2 [formerly b85ccd6315e5506c67c39f939c71af363d15a45f]]]
Former-commit-id: b6a21ccb7c
Former-commit-id: bee76b7681ee23a6fc910b891da62bad416be0e8 [formerly 1b0a722e02]
Former-commit-id: ff88e4ab99
2014-01-13 12:56:24 -06:00
Mike Duff
e395071beb Issue #2636 - Removed apache Equals and Hashcode builder, using eclipse generated versions.
Former-commit-id: c6f92e9207 [formerly 2a1f84b72d] [formerly 92b404f6ec] [formerly 9e817de4a9 [formerly 92b404f6ec [formerly 605f5a0a496deeb9be0e3aed1a56f6ac816038b4]]]
Former-commit-id: 9e817de4a9
Former-commit-id: 7d5d1b7a0fc09fb10c44af68831e25eff4f1f078 [formerly fc3dec0591]
Former-commit-id: 850ee18fd4
2014-01-13 09:25:34 -06:00
Brad Gonzales
6868d8d12d Issue #2615 Refactored Subscription valid time period calculation from BandwidthDaoUtil to
RecurringSubscription.  Add environment configuration files to unit tests setup.  Changed the
devRegistry debug port to the same port as registry.

Amend: Updates from peer review.

Change-Id: I4f5a25d4667dc949804b86541a9d9428728b779a

Former-commit-id: 2c0c6fbcc7 [formerly 8eeb3dc412] [formerly 4537513df7] [formerly 343a2495e5 [formerly 4537513df7 [formerly 33a3dead503276926af71d7355f87242f5250e54]]]
Former-commit-id: 343a2495e5
Former-commit-id: 1b6fea4b1e1ad9152e19bb26118b1df57cd9ade0 [formerly 4049af9630]
Former-commit-id: f57529be9b
2014-01-10 16:37:09 -06:00
Richard Peter
1e10acc664 Merge "Issue #2452 - Add label stating all lat/lons will be converted to easting." into omaha_14.2.1
Former-commit-id: 434c05b458 [formerly bc4ad18fe9] [formerly 7bbefddcc1] [formerly e6d7acb609 [formerly 7bbefddcc1 [formerly 1855c0e2d601fd3c5b20d8ba58d157e9fb993b8b]]]
Former-commit-id: e6d7acb609
Former-commit-id: 08b064f5627b0585a3df75b960a722fde7817d6f [formerly 527408ddd4]
Former-commit-id: 5b687c7bd5
2014-01-10 15:42:48 -06:00
Richard Peter
3ba91590bc Merge "Issue #2642 - Update header comment" into omaha_14.2.1
Former-commit-id: 36feeef940 [formerly 9e0827e8b0] [formerly 7976713662] [formerly e841723f1c [formerly 7976713662 [formerly dd2716d0f2541d300a81edcdb604bdb151cecb40]]]
Former-commit-id: e841723f1c
Former-commit-id: af136cfa606ce56f14f973561d55be09fe06ffaf [formerly f3c30e7369]
Former-commit-id: 1d4a0ae816
2014-01-10 15:42:24 -06:00
Richard Peter
b3059957bc Merge "Issue #2636 - change log statements, add missing copyright headers" into omaha_14.2.1
Former-commit-id: 550b40a4bf [formerly 60f22e2d4c] [formerly 48184fe695] [formerly 51c8919ea7 [formerly 48184fe695 [formerly 974e2fb98c17fe843025346954d727fb9d72a408]]]
Former-commit-id: 51c8919ea7
Former-commit-id: dc61c2e1e5f79882b6b9ca4a2f583310cd1d52df [formerly cf2c9c530c]
Former-commit-id: b15476b43e
2014-01-10 15:42:08 -06:00
Richard Peter
acd5ef7973 Merge "Issue #2684 - BandwidthUtil bean now depends on registerDataDeliveryHandlers bean" into omaha_14.2.1
Former-commit-id: 3d4ee9f0a3 [formerly 44f02d072e] [formerly 2580f289e9] [formerly 757e8d2c4b [formerly 2580f289e9 [formerly 362e90dcf918893137cd8fe0eaddd1fcbfb86538]]]
Former-commit-id: 757e8d2c4b
Former-commit-id: 7f8dc6b05899865dc8e1d89db9988cd53d0705f6 [formerly b1a2d3183f]
Former-commit-id: 9cfb816557
2014-01-10 15:41:28 -06:00
Ron Anderson
2e9d07a0cf Issue #2044 Fix some error handling in GFE to eliminate exceptions in edex logs.
Change-Id: Iad8edf92318d6c9277648396ba450a3fc6eb5c5a

Former-commit-id: 41354cddf7 [formerly 7cae1b981d] [formerly 89f07fe932] [formerly 1c520b8cd1 [formerly 89f07fe932 [formerly 3f9f254229066cfe12501aacd14e68937764fadb]]]
Former-commit-id: 1c520b8cd1
Former-commit-id: 0a9b4434bf29a1eed5671f4ab66b9040010b48e6 [formerly bbac6df77d]
Former-commit-id: 9df631248d
2014-01-10 15:01:10 -06:00
Ron Anderson
ab5ab0ebe3 Merge "Issue #2508 Restore DiscreteGridSlice.setKey method used by iscMosaic." into omaha_14.2.1
Former-commit-id: dacdddf403 [formerly 90a2c83c8e] [formerly b8a33ecdf8] [formerly 41b081307c [formerly b8a33ecdf8 [formerly dded4c12d27baede94b789d288d6bcb39e777f9f]]]
Former-commit-id: 41b081307c
Former-commit-id: 093ac09bf206a0017a0e5d3a730bba837dde43a2 [formerly a35a46de1b]
Former-commit-id: 76965c12dd
2014-01-10 13:29:59 -06:00
Ron Anderson
7b369af525 Issue #2508 Restore DiscreteGridSlice.setKey method used by iscMosaic.
Change-Id: I503cf82ce896e8cdf39c238eda0f31453d8510a5

Former-commit-id: 4e479cf9bd [formerly 17ed8a6e75] [formerly 3017260991] [formerly d80ce4a19e [formerly 3017260991 [formerly 142f68c426c4e2fbeb1e0b97cbb7b47c38e3b90d]]]
Former-commit-id: d80ce4a19e
Former-commit-id: aa04179c7e3f5387a4ead15786aaad0bb4f86872 [formerly 57d3503ed6]
Former-commit-id: d70701cc6e
2014-01-10 13:17:44 -06:00
Mike Duff
6440aa8375 Issue #2684 - BandwidthUtil bean now depends on registerDataDeliveryHandlers bean
Change-Id: I6f491e7e14e445b59e93f5896eedde3062246034

Former-commit-id: 696003d463 [formerly 26e34bb4d1] [formerly b50ea7b162] [formerly 744d7367dc [formerly b50ea7b162 [formerly 12500574ade0eced65454ff981b83f8f729cd125]]]
Former-commit-id: 744d7367dc
Former-commit-id: bbcc98303dcc89e98466e092b86268e5c8a053c9 [formerly 0e5332e8cd]
Former-commit-id: 3274c591bf
2014-01-10 12:14:27 -06:00
Mike Duff
c8885b34f1 Issue #2452 - Add label stating all lat/lons will be converted to easting.
Former-commit-id: 2e6173b619 [formerly 67f6311354] [formerly 69ca0dd0d2] [formerly 7081c26823 [formerly 69ca0dd0d2 [formerly 84bff804bc089aefcf126a586539eab590e1d04a]]]
Former-commit-id: 7081c26823
Former-commit-id: e5367b16239e543229d0aace6c8f70b5970faf5e [formerly 17d19cc0bb]
Former-commit-id: b616f34af2
2014-01-10 12:05:30 -06:00
Mike Duff
5f19ccc46e Issue #2642 - Update header comment
Former-commit-id: b70c96297f [formerly 5d669a97af] [formerly 101d9939d6] [formerly 28114764a5 [formerly 101d9939d6 [formerly 389426adddf3a78d9859f704ecc2241e453b5dc2]]]
Former-commit-id: 28114764a5
Former-commit-id: 32bb19308f502de6a22ca9009876c463c872be8c [formerly 7d25b33cb6]
Former-commit-id: 12c47ea375
2014-01-10 10:57:18 -06:00
Mike Duff
ae88e49e26 Issue #2636 - change log statements, add missing copyright headers
Former-commit-id: 8fe7d83f6f [formerly 8993103c45] [formerly 12a8618c42] [formerly 3be3a8ac0d [formerly 12a8618c42 [formerly 8bf5a8185c09e9d368afc8e8e7409222164159aa]]]
Former-commit-id: 3be3a8ac0d
Former-commit-id: 7b4e8fc0dd59dffc07172aea3397179483206f25 [formerly e121eb5dbd]
Former-commit-id: ea07460e3e
2014-01-10 10:55:17 -06:00
Nate Jensen
e63bac199d Issue #2359 log exceptions in FFTI processing
Change-Id: Iec1c743352187de071f4b9840f1672bff531ba94

Former-commit-id: 8a469f686a [formerly 1d9229a4a6] [formerly d289eb1b55] [formerly 43b75928e4 [formerly d289eb1b55 [formerly 2abd0cc65b6fe98dc95e11b5b8d53a325c0f2074]]]
Former-commit-id: 43b75928e4
Former-commit-id: 46539e0877f8c37fe79c6bcc26836d7cf6855c9f [formerly daba59930d]
Former-commit-id: 8b5ce7c07f
2014-01-10 08:57:18 -06:00
Richard Peter
a25ad86347 Merge "Issue #2642 - Make shared sub deletions remove the site from the list" into omaha_14.2.1
Former-commit-id: 102bbe3e15 [formerly b37d6e9c91] [formerly 8ca1217f03] [formerly 52850fe95a [formerly 8ca1217f03 [formerly f5e5e1e66bf7264408e31b95ebf73d083b3cff0f]]]
Former-commit-id: 52850fe95a
Former-commit-id: 766dc3d39c99f73f010de1c29095aef2b852645e [formerly 690f1b15dd]
Former-commit-id: b833c4333c
2014-01-09 16:58:39 -06:00
Richard Peter
5cf3d3349c Merge "Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches" into omaha_14.2.1
Former-commit-id: 6227cb9e3c [formerly c32d55f3fc] [formerly 36ed029f0a] [formerly 0f3175bd77 [formerly 36ed029f0a [formerly b53137d1af67ff95a91b4bf4d2aa78ef4c43b80a]]]
Former-commit-id: 0f3175bd77
Former-commit-id: 3d87934664370f4c41ebd107b46989b9bcbb1cff [formerly c95d310568]
Former-commit-id: 78313bec85
2014-01-09 16:58:31 -06:00
Richard Peter
a2eef48cfb Merge "Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible." into omaha_14.2.1
Former-commit-id: a39f2bff20 [formerly 0bd52b65e7] [formerly b711c35c68] [formerly f45a281935 [formerly b711c35c68 [formerly 8f3f97302417e256cd110feb4ed56ca366cb1db8]]]
Former-commit-id: f45a281935
Former-commit-id: 8e88f0da68170bd6d7f37b03b43ebe72c7b0e3e4 [formerly 0459cd237e]
Former-commit-id: f4108b8be2
2014-01-09 16:53:52 -06:00
Mike Duff
2a94a50ec8 Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible.
Former-commit-id: 41ac6a70dd [formerly e4f56affd3] [formerly 16a8f16ee4] [formerly 9b5adfaba2 [formerly 16a8f16ee4 [formerly 87dd0df07a9ef0e7881ed0cf7b8aa1d41f0c9d4d]]]
Former-commit-id: 9b5adfaba2
Former-commit-id: c5a413c1f93f4b03121d44e01630e558a6904c48 [formerly 7a1712acd6]
Former-commit-id: d2f74b6238
2014-01-09 13:02:08 -06:00
Mike Duff
f6d58f7615 Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches
Former-commit-id: 99d7e51456 [formerly 30b65a4fe7] [formerly 183ca614df] [formerly a264cb06a1 [formerly 183ca614df [formerly b841e795f2a18bf902ec373c9f79b191db177fde]]]
Former-commit-id: a264cb06a1
Former-commit-id: 1723170c25ee5bf976e58a1096d080a768d79925 [formerly 4620b69f08]
Former-commit-id: 05b6508299
2014-01-09 10:29:21 -06:00
Mike Duff
ff76fa081c Issue #2643 - Fixed the mouse checking on DD maps
Former-commit-id: 3d962a5425 [formerly 7b8964d9b2] [formerly 4fe2dc76af] [formerly 56499a77c3 [formerly 4fe2dc76af [formerly 775e99924e098387e4ca5042823ef20d1a0d2afe]]]
Former-commit-id: 56499a77c3
Former-commit-id: 276825c6d8c7a85fe6b1be0854404a47fc47b5c8 [formerly 09c5f29395]
Former-commit-id: 1c3b700563
2014-01-09 10:18:34 -06:00
Mike Duff
1c60e6e7cc Issue #2642 - Make shared sub deletions remove the site from the list
Former-commit-id: 7720852347 [formerly 0cb61d4d50] [formerly 6cff7aaf0c] [formerly 4e6b4eaa4c [formerly 6cff7aaf0c [formerly a8f57c338a8a06c6d40842f56c329fd9f215bc5b]]]
Former-commit-id: 4e6b4eaa4c
Former-commit-id: 87757eade8f87fee23058c260317eed10f66609c [formerly fdef5e97e2]
Former-commit-id: 0e081e8ee2
2014-01-09 10:15:48 -06:00
Ron Anderson
b37209e9f5 Merge "Issue #2657: Update convertCDL2XML for unified grid." into omaha_14.2.1
Former-commit-id: 5d56dfe4f5 [formerly be370fe7d6] [formerly 6febe84651] [formerly ad824dcf9f [formerly 6febe84651 [formerly 7fcc9e660049074c4c1e6a918d371182b40278ba]]]
Former-commit-id: ad824dcf9f
Former-commit-id: d21b6ac36f41e5c6e6bfcb3175698aad829f2392 [formerly 7163de49e5]
Former-commit-id: dd2e82a135
2014-01-08 15:02:26 -06:00
Richard Peter
a1121ab34b Merge "Issue #2645 Prevent the recurring time in SubscriptionNotifyTask from being killed by an exception thrown from run. Fix issue where the InMemoryBandwidthBucketAllocationAssociator was not updating the in memory allocation when the db value status was updated. Added RegistryBandwidthRecord to the list of classes to init by HibernateBandwidthDbInit. Updates to hibernate.cfg.xml for Richard." into omaha_14.2.1
Former-commit-id: e0388d76cf [formerly b0479dfdc6] [formerly 5f65479ba1] [formerly 5fa03e7352 [formerly 5f65479ba1 [formerly 3cd86c518839710768c9a0552749fa96f936f2c4]]]
Former-commit-id: 5fa03e7352
Former-commit-id: c7dcc03215c8979da68de0120dfaad26214e39c3 [formerly 029bbb8fc2]
Former-commit-id: f06b4aba13
2014-01-08 14:30:38 -06:00
Nate Jensen
a8b46a337f Merge "Issue #2359 change some log statements to debug" into omaha_14.2.1
Former-commit-id: fc3a61518d [formerly 6585b79144] [formerly 415c5f224a] [formerly 9a5630f5bb [formerly 415c5f224a [formerly b226f3ebfd3932d51d38982ae5c13364aaec2f5b]]]
Former-commit-id: 9a5630f5bb
Former-commit-id: 496fb0eb9e6f5c0a409f8534dd512391066ea75f [formerly 56d932ee56]
Former-commit-id: 7dcae0a1be
2014-01-08 13:56:54 -06:00
Brad Gonzales
ad3da98af6 Issue #2645 Prevent the recurring time in SubscriptionNotifyTask from being killed by an exception
thrown from run.  Fix issue where the InMemoryBandwidthBucketAllocationAssociator was not updating the in memory allocation
when the db value status was updated.  Added RegistryBandwidthRecord to the list of classes to init by HibernateBandwidthDbInit.
Updates to hibernate.cfg.xml for Richard.

Change-Id: I0eb7b0a34e48f6b8db8065dee45966c48ef38617

Former-commit-id: c05358aac5 [formerly 02910c2a8c] [formerly 07a4420596] [formerly 12860c79f9 [formerly 07a4420596 [formerly e0dbe59a7dc418e3b8ed62396b6ef2047b5990fd]]]
Former-commit-id: 12860c79f9
Former-commit-id: 53dd09e9f01677738d8bb7bceaf559f45f59115c [formerly be6f12e9c2]
Former-commit-id: 5c85734e02
2014-01-08 13:37:17 -06:00
Nate Jensen
5168eefb50 Merge "Issue #2581 fix yet another LSR decoding error" into omaha_14.2.1
Former-commit-id: 136cfae0a5 [formerly 5bd0aa68d9] [formerly ee3c118cb0] [formerly ce24723a68 [formerly ee3c118cb0 [formerly b025f9ff3b1ecbe485418b3d19312777f5af8775]]]
Former-commit-id: ce24723a68
Former-commit-id: 85e94dd1992438356a7a3f1afa2711bb313caf35 [formerly f47773c451]
Former-commit-id: b273eb58a6
2014-01-08 11:30:05 -06:00
David Gillingham
0012cf9134 Issue #2657: Update convertCDL2XML for unified grid.
Former-commit-id: 4925478a0b [formerly 476fcb7980] [formerly ed22a86d9f] [formerly d6397522c4 [formerly ed22a86d9f [formerly 247536f4d83c7f7de449707916d2950ae74be551]]]
Former-commit-id: d6397522c4
Former-commit-id: cf78b85e4b8682c0ad54f461f0024241114e38bb [formerly 777c1fba86]
Former-commit-id: 3e0ef451a1
2014-01-08 11:02:30 -06:00
Nate Jensen
945671fdc4 Issue #2581 fix yet another LSR decoding error
Change-Id: I74e6d8c3d5c6bf71ebbc3fe32ea93ea688c6bcb5

Former-commit-id: df3778f7c6 [formerly 79c9792148] [formerly 3ac67a743f] [formerly 968e51040d [formerly 3ac67a743f [formerly 3f2c97439a1dbbbc94285343b3b558dead63a0f6]]]
Former-commit-id: 968e51040d
Former-commit-id: 171f2bf5c41ccd55e091d92fc423bb389db59ba0 [formerly 79836008d7]
Former-commit-id: 59fc27dafb
2014-01-08 08:56:02 -06:00
Ron Anderson
9aae54c713 Issue #2509 Fix merge error in iscMosaic (fix indentation)
Change-Id: I1745af1a51d6fffe221168cc8dca217d2f309007

Former-commit-id: 167ef0a302 [formerly b0fa3c6514] [formerly 4da9799eaf] [formerly 82d3277785 [formerly 4da9799eaf [formerly 94c97fee9c6925ac9e73530bd18ec03d8cab4a40]]]
Former-commit-id: 82d3277785
Former-commit-id: 400aac7d966ddfd5fb28ad35617d4abd86685c39 [formerly 4fe580f47b]
Former-commit-id: 89c27cc683
2014-01-08 08:49:32 -06:00
Nate Jensen
8356b85925 Issue #2359 change some log statements to debug
Change-Id: Ie549917b36268d3f5983f3946701418e7e3b5163

Former-commit-id: 77a8e7f321 [formerly b3d6ba3bc9] [formerly bfa6c60c66] [formerly cb52747de2 [formerly bfa6c60c66 [formerly 146a9cca0ffa68f44068c620a3fa693c46db9031]]]
Former-commit-id: cb52747de2
Former-commit-id: 66c48114fb9f6bf3d321abdbd200ebd96ea88c1c [formerly ded9b32ea1]
Former-commit-id: d477169f0d
2014-01-07 17:53:43 -06:00
Richard Peter
58f8909add Merge "Issue #2658 Changes to ACARSPersistObs to ignore cutoff time when allowing archive." into omaha_14.2.1
Former-commit-id: 1172e81e6b [formerly 0a16411de4] [formerly 9c0d63d841] [formerly 97bde8138d [formerly 9c0d63d841 [formerly e6b1f12dd3a36b76e60d0e90941f94948022813a]]]
Former-commit-id: 97bde8138d
Former-commit-id: a00e1d1aa39cae3b5045f2790d4e5adb9b27eb8c [formerly b899a0591f]
Former-commit-id: 4bebf53fda
2014-01-07 15:40:04 -06:00