Mike Duff
80bc52c4e7
Issue #2636 - Changed subscription code to use gmt calendar.
...
Former-commit-id: 6be7c7f19d
[formerly 4440c27ff6
] [formerly 6e01cdb78e
] [formerly 6be7c7f19d
[formerly 4440c27ff6
] [formerly 6e01cdb78e
] [formerly 1caacacfe3
[formerly 6e01cdb78e
[formerly 3e75bd3e55517bca7c85213307ed67973c2f145e]]]]
Former-commit-id: 1caacacfe3
Former-commit-id: 72add752c4
[formerly a76507e04f
] [formerly 90eb5dfcc392c5bf771336615dc907357a6e0670 [formerly f4da152d87
]]
Former-commit-id: 9da424eeb82f536b9d2ca78ee2c3cd261b97de50 [formerly 1f4cc8681d
]
Former-commit-id: 3495a67c27
2014-01-28 11:09:33 -06:00
Brad Gonzales
7e84f1a451
Issue #2709 updated devRegistry.sh and added retrieval monolithic for running shareds in devRegistry.
...
Amend: update from peer review.
Change-Id: I1986de99319fdecd21a94579c499266b048d382a
Former-commit-id: 208d18e28e
[formerly afbaf72617
] [formerly e94023097e
] [formerly 208d18e28e
[formerly afbaf72617
] [formerly e94023097e
] [formerly 02f9fd20dc
[formerly e94023097e
[formerly 4057294c4f777ffb4ea3523bbaea7ed1a084cbd6]]]]
Former-commit-id: 02f9fd20dc
Former-commit-id: 07eac8a84d
[formerly 71a32928d9
] [formerly 44dcb29c662d33832c30a88262faccc81d37a10a [formerly a40afbe8ac
]]
Former-commit-id: e98e41995555ae6eff555a6489dfa8be21dda1aa [formerly f7c3c8c83d
]
Former-commit-id: 7707be3dcd
2014-01-26 20:31:38 -06:00
Lee Venable
b1d34fdb1e
Merge "Issue #2584 Step one of versioning for DD Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00" into omaha_14.2.1
...
Former-commit-id: ae3cf2d231
[formerly 1ea52fdbcd
] [formerly 6c9a4394b7
] [formerly ae3cf2d231
[formerly 1ea52fdbcd
] [formerly 6c9a4394b7
] [formerly 805f63c0ec
[formerly 6c9a4394b7
[formerly b6d4e063c3f99ba78a933435a87090e813643836]]]]
Former-commit-id: 805f63c0ec
Former-commit-id: 0d484d1268
[formerly d94aebebec
] [formerly 67a965ba9d9faed6e9ff353fb98752e5ac47a589 [formerly f43d763ec6
]]
Former-commit-id: a92ba185f4403086281b4a0a5aa0cee00fecc52e [formerly 6c64419546
]
Former-commit-id: a33a533acc
2014-01-26 17:01:17 -06:00
Mike Duff
645998a25d
Issue #2636 - Fix scheduling gaps at start and end of retrieval plan
...
Change-Id: I43930a2cb69f44c83eeec605861bcf6a52a0a26b
Former-commit-id: 439f0ab55a
[formerly a4a910daf1
] [formerly 6f7cadba9f
] [formerly 439f0ab55a
[formerly a4a910daf1
] [formerly 6f7cadba9f
] [formerly 4334640c22
[formerly 6f7cadba9f
[formerly c0d49492af75d0411d6c0c2541af440302595b6a]]]]
Former-commit-id: 4334640c22
Former-commit-id: 82ea159287
[formerly c8e199569a
] [formerly ee5e22e05d90a6bf7102e085b4c3e6311e5a6121 [formerly 3e26dc54df
]]
Former-commit-id: bf35956d28e0d66ed96bc4d2006f484c68071f63 [formerly a7eed82b28
]
Former-commit-id: 952c843d02
2014-01-25 14:09:02 -06:00
Dave Hladky
a7e3c8728a
Issue #2584 Step one of versioning for DD
...
Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00
Former-commit-id: c8af2af177
[formerly e15b9e2ba9
] [formerly 523e100fd0
] [formerly c8af2af177
[formerly e15b9e2ba9
] [formerly 523e100fd0
] [formerly 690b5b73cf
[formerly 523e100fd0
[formerly 878f95f025dc07ec6ce73f715cef57193493e9eb]]]]
Former-commit-id: 690b5b73cf
Former-commit-id: 415f804868
[formerly c87bd8b764
] [formerly 980f786bfb20e2cd526cc5a268a6de91237106d0 [formerly dccf640640
]]
Former-commit-id: 907d1ea8d4446ef2d8111f61c5890cb05dc25cd8 [formerly fa350b76c9
]
Former-commit-id: 362f38157d
2014-01-24 14:44:12 -06:00
Nate Jensen
9081058ca2
Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
...
Former-commit-id: 26ce19331e
[formerly 9028260386
] [formerly ae10129713
] [formerly 26ce19331e
[formerly 9028260386
] [formerly ae10129713
] [formerly 9d529b3b21
[formerly ae10129713
[formerly 61b073cef0bfe65634096221d8ee8aef37f9e1ed]]]]
Former-commit-id: 9d529b3b21
Former-commit-id: 9f4360fdda
[formerly 98e1bf9194
] [formerly 194b6af74ffb08201bff51fb4de3ff2d6d3448d9 [formerly 1be41d69c6
]]
Former-commit-id: d4f72fd00fd9496a9587b235b75d9efcd7bc6b81 [formerly 3d6d9118ea
]
Former-commit-id: 86b9311ed4
2014-01-15 17:36:30 -06:00
Brad Gonzales
69f2e8a94a
Issue #2678 Fix for multiple threads grabbing a retrieval for processing.
...
Change-Id: I1e982d4db4d4f68531b8b9c65e7070bff3825c28
Former-commit-id: dd09d84c73
[formerly a2fbcecef6
] [formerly 3e3fcfa9af
] [formerly dd09d84c73
[formerly a2fbcecef6
] [formerly 3e3fcfa9af
] [formerly 46a2a5f70f
[formerly 3e3fcfa9af
[formerly 3d396223b93631f0ea561a4df8ae9a3d71dde767]]]]
Former-commit-id: 46a2a5f70f
Former-commit-id: 26c902d957
[formerly 7e608842b2
] [formerly 4a9c736666cc3f62be99481509da930add8b7094 [formerly a1429a3911
]]
Former-commit-id: 89b9939480bd370d75e57032e518294ed0d2c802 [formerly d2fac3ed56
]
Former-commit-id: 15bcc55822
2014-01-15 17:16:47 -06:00
Mike Duff
5ea95dbca9
Issue #2459 - Refactor the subscription status
...
Former-commit-id: 43810aa5f5
[formerly d03c012a54
] [formerly f94593867e
] [formerly 43810aa5f5
[formerly d03c012a54
] [formerly f94593867e
] [formerly 245d76358e
[formerly f94593867e
[formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]]]]
Former-commit-id: 245d76358e
Former-commit-id: c5f28e0f37
[formerly 9a45b95db6
] [formerly ebd7027d07dcf26d5e0b30ecd0d661a72afa18e1 [formerly d96a9d2937
]]
Former-commit-id: 86f4629abcfe03116c78ec209c22d6df91eac0b9 [formerly 3c0634b1e8
]
Former-commit-id: c8f7edbcad
2014-01-15 09:21:30 -06:00
Brad Gonzales
d5d66b8731
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 2c0c6fbcc7
[formerly 8eeb3dc412
] [formerly 4537513df7
] [formerly 343a2495e5
[formerly 4537513df7
[formerly 33a3dead503276926af71d7355f87242f5250e54]]]]
Former-commit-id: 343a2495e5
Former-commit-id: 6868d8d12d
[formerly f57529be9b
] [formerly 1b6fea4b1e1ad9152e19bb26118b1df57cd9ade0 [formerly 4049af9630
]]
Former-commit-id: 2c41b1048f19e32de7cfb868829f77a4d1b22782 [formerly 8b362ee404
]
Former-commit-id: b8c7be1225
2014-01-10 16:37:09 -06:00
Mike Duff
f5d13adc34
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 99d7e51456
[formerly 30b65a4fe7
] [formerly 183ca614df
] [formerly a264cb06a1
[formerly 183ca614df
[formerly b841e795f2a18bf902ec373c9f79b191db177fde]]]]
Former-commit-id: a264cb06a1
Former-commit-id: f6d58f7615
[formerly 05b6508299
] [formerly 1723170c25ee5bf976e58a1096d080a768d79925 [formerly 4620b69f08
]]
Former-commit-id: eda2ee87762a8696e1f7816588a6c03614038065 [formerly 4bd12c488b
]
Former-commit-id: 621bbe5ce6
2014-01-09 10:29:21 -06:00
Ben Steffensmeier
c41c64ce5b
Issue #2619 Fix rare dateline bug.
...
Former-commit-id: 1b99b5aca0
[formerly 45e4b4bbad
] [formerly 399c579671
] [formerly 1b99b5aca0
[formerly 45e4b4bbad
] [formerly 399c579671
] [formerly 607b5edb69
[formerly 399c579671
[formerly 8231fde4fdcb25ad19e31dd8e4f5716becba347c]]]]
Former-commit-id: 607b5edb69
Former-commit-id: 6a35407957
[formerly 58dabbfc87
] [formerly fc52d111900f81c3257ff7f1b3c079e152fb00d3 [formerly d0f4b18b78
]]
Former-commit-id: 9fc0459f3f576463d2cc040689f06ba824bcec45 [formerly a92f15a8fa
]
Former-commit-id: 463ad8e8fa
2013-12-12 10:30:22 -06:00
Brad Gonzales
d1fa8c738b
Issue #2566 Refactored BandwidthManagerCreators to load spring files using Executor.extractSpringFiles.
...
Amend: Refactored Executor static modes specific methods into a EDEXModesUtil class in
the edex.core.modes package. Move EdexMode, DefaultEdexMode, and EdexModesContainer
to the same package.
Change-Id: Ib6af9557ca8d875c5eff162b46bf56e2c041e0fb
Former-commit-id: 310597d856
[formerly 3d34764022
] [formerly 410a00c72a
] [formerly 310597d856
[formerly 3d34764022
] [formerly 410a00c72a
] [formerly 72df38075f
[formerly 410a00c72a
[formerly 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4]]]]
Former-commit-id: 72df38075f
Former-commit-id: fa097589d0
[formerly e18f7b2380
] [formerly d6d85c281b70c2e07827f44bc42368ab797e8062 [formerly c54fe467a3
]]
Former-commit-id: e96fbe2c0a9f49c38dbe9b9eb76448f730afdb58 [formerly 3d592d0b38
]
Former-commit-id: 143e160eae
2013-12-05 15:17:14 -06:00
Richard Peter
077ddd9818
Merge "Issue #2545 - Get bandwidth graph data by network" into development
...
Former-commit-id: da82396995
[formerly df4a4c5121
] [formerly d0b50eee3c
] [formerly da82396995
[formerly df4a4c5121
] [formerly d0b50eee3c
] [formerly 6fde307f0a
[formerly d0b50eee3c
[formerly a31695805478d27e072d069d5d3b369001c1d80d]]]]
Former-commit-id: 6fde307f0a
Former-commit-id: 3088533103
[formerly 45889cb80f
] [formerly ab63c3e242c8f489c2b55d427b4ca49dfd7b4657 [formerly 9f4dfc9051
]]
Former-commit-id: 714bcfc3b217ba5f4187ec79b31726d5a3bcf4c4 [formerly ef7ba1f1ee
]
Former-commit-id: 8cde2b5e9d
2013-12-05 14:54:46 -06:00
Mike Duff
6bacb944fb
Issue #2545 - Get bandwidth graph data by network
...
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314
Former-commit-id: c7345582e9
[formerly a412a19583
] [formerly 4796f43495
] [formerly c7345582e9
[formerly a412a19583
] [formerly 4796f43495
] [formerly 0c452e2434
[formerly 4796f43495
[formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]]]
Former-commit-id: 0c452e2434
Former-commit-id: 802e0d360c
[formerly 45cf9384d8
] [formerly 0a68403f743b2b5033d96fa1433b811164defb55 [formerly 7f2ddb1360
]]
Former-commit-id: 6357394278816b4bba40d3a8336a9f549bcbbad8 [formerly d3c5ee0468
]
Former-commit-id: 0885df1d3f
2013-12-05 13:35:31 -06:00
Benjamin Phillippe
05697b7d21
Issue #1829 Refactored EBXML registry objects
...
Change-Id: I0f1b2ecbac19cdc2304680d4dbdfb5d963f0649d
Former-commit-id: da4f658b7a
[formerly ed890ce9d9
] [formerly 0b0e70b667
] [formerly da4f658b7a
[formerly ed890ce9d9
] [formerly 0b0e70b667
] [formerly ed77440c28
[formerly 0b0e70b667
[formerly 6eb387e69c2fc4837b58f99e4343a745162fb384]]]]
Former-commit-id: ed77440c28
Former-commit-id: 2165a9059a
[formerly 7051d10140
] [formerly 30d36d7bd29ad367d12eab6b8c4f863628e42d08 [formerly 7ed6195536
]]
Former-commit-id: e1c980933ce90b17acef2e071f802300ba5224f4 [formerly 3d7c473241
]
Former-commit-id: 8c1e55db1f
2013-12-05 10:20:24 -06:00
Ron Anderson
d3d2ea3745
Issue #2331 Fixed Topo retrieval for smartTools/procedures
...
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3
Former-commit-id: 218a052bbf
[formerly 497236ca74
] [formerly b5906249cc
] [formerly 218a052bbf
[formerly 497236ca74
] [formerly b5906249cc
] [formerly 20eeb2796e
[formerly b5906249cc
[formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]]
Former-commit-id: 20eeb2796e
Former-commit-id: fb3b7b0a9f
[formerly e30d6041ee
] [formerly 473bec12d3fe432d141080f1a78bde66bd1ac17b [formerly 103fed386f
]]
Former-commit-id: 89e88491b334d8f079138c920fd456262fa46656 [formerly 89e87a1683
]
Former-commit-id: bbd7ea36a1
2013-12-04 17:10:48 -06:00
Richard Peter
956a39cf72
Merge "Issue #1736 Add registry bandwidth tracking Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6" into development
...
Former-commit-id: 2a2473f3bb
[formerly ff44393e90
] [formerly ea7dac5993
] [formerly 2a2473f3bb
[formerly ff44393e90
] [formerly ea7dac5993
] [formerly 0281447166
[formerly ea7dac5993
[formerly 2cef3f9742ac0dcff0e9d90507abc30714e8548f]]]]
Former-commit-id: 0281447166
Former-commit-id: 8f9b6fa07c
[formerly d937861d05
] [formerly f8b518f19e6bc75858971de994088a9caa63f0de [formerly f6808e6623
]]
Former-commit-id: c7aa9d937c01012c67dfbd64e95131561967b13e [formerly 8cdd151d64
]
Former-commit-id: 54c056a310
2013-12-04 12:00:40 -06:00
Dave Hladky
4d222b0a16
Issue #1736 Add registry bandwidth tracking
...
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6
Former-commit-id: bce11dec14
[formerly 6607e5fe30
] [formerly 483ec5d22f
] [formerly bce11dec14
[formerly 6607e5fe30
] [formerly 483ec5d22f
] [formerly 593f24023d
[formerly 483ec5d22f
[formerly 695365c03ac142960a22e6774f3a10fd5e16cd35]]]]
Former-commit-id: 593f24023d
Former-commit-id: 36f601253e
[formerly 09aa3a6c62
] [formerly 035f4702c002daa8199c28c0d3ad1c8b496bd6ab [formerly 4060748634
]]
Former-commit-id: f25d919b9119ff63b128cb8bcb67039b0f6d8ae8 [formerly dc5f5f3c87
]
Former-commit-id: 25745e2782
2013-12-04 11:58:49 -06:00
Ben Steffensmeier
43c8bab420
Issue #2528 Allow geostationary data to display on an identical projection.
...
Change-Id: I930cd35a2e2fd7f6b1347cd9d5063fe9cd578d46
Former-commit-id: 7dd3dd2332
[formerly 5369a757ce
] [formerly 048f968147
] [formerly 7dd3dd2332
[formerly 5369a757ce
] [formerly 048f968147
] [formerly 59d806fa7e
[formerly 048f968147
[formerly c2b5cca6c1c02122a8d006704f415868debe4f75]]]]
Former-commit-id: 59d806fa7e
Former-commit-id: e3b84502cb
[formerly a78188ecb9
] [formerly c7a36153bad0dfab90f971ef314e2c47b661772c [formerly 37f6acbb99
]]
Former-commit-id: 05df042bf68043ed948634a9cff1c9cac3771b5c [formerly 14d7341d68
]
Former-commit-id: d06d42ec24
2013-11-26 17:38:29 -06:00
Ben Steffensmeier
70175dca9c
Issue #2528 Add brute force method of calculating geostationary envelope intersections.
...
Change-Id: Ie02ae1e493015dcca88468633db65c51cd701adf
Former-commit-id: 4d86af4f02
[formerly 9627cf0f6f
] [formerly 30d125f95a
] [formerly 4d86af4f02
[formerly 9627cf0f6f
] [formerly 30d125f95a
] [formerly 00af766143
[formerly 30d125f95a
[formerly 393aba6883e536912f7b1e34bd922d53eaa63727]]]]
Former-commit-id: 00af766143
Former-commit-id: 1b022bfd31
[formerly abdb1c504c
] [formerly cacb3acbd0ce426c88a1a423cb2359588872f550 [formerly 6faafa2dfc
]]
Former-commit-id: d647546ac1988d0bcf6c0706e18af03814592a9d [formerly c742abd06e
]
Former-commit-id: 67b724a541
2013-11-20 15:36:27 -06:00
Brian Clements
2c76698c78
Issue #2546 added fix for TAFs that contain legacy valid times
...
added unit test
Former-commit-id: 04a9d3ae08
[formerly b0a5192dfa
] [formerly 191ffc6e63
] [formerly 04a9d3ae08
[formerly b0a5192dfa
] [formerly 191ffc6e63
] [formerly df1542a66c
[formerly 191ffc6e63
[formerly 6d33448f0f6962a3da2a5c51f27253173f40cb93]]]]
Former-commit-id: df1542a66c
Former-commit-id: 381a274111
[formerly bca5149811
] [formerly 3ac020de4f913cf98382a5249c8fda9e76a0edaa [formerly 0e5d3e9e69
]]
Former-commit-id: 31f963a907811d6d1817831b842056f2d9e806f2 [formerly b511453153
]
Former-commit-id: 1d41861c3c
2013-11-13 08:07:29 -06:00
Brad Gonzales
0aa3b220bf
Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes.
...
Amend: Separate update from create notifications in LifecycleManagerImpl.
Refactored notification sending in EdexBandwidthManager.
Fixed error in LifecycleManagerImpl refactor.
Added comment to isRecurringSubscription.
Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77
Former-commit-id: 50fb18601c
[formerly 62e4cafa27
] [formerly 8f70fb1d0c
] [formerly 50fb18601c
[formerly 62e4cafa27
] [formerly 8f70fb1d0c
] [formerly aea0e847aa
[formerly 8f70fb1d0c
[formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]]]
Former-commit-id: aea0e847aa
Former-commit-id: 725742f4ec
[formerly 7747d901f7
] [formerly 690f66cc7e89cdd24f8b28a0befbcc33117dfd20 [formerly 866a11a9f0
]]
Former-commit-id: 0b81bcbc6ab893fa04a28ec2f1a491d80e5eeec8 [formerly bad9b3242a
]
Former-commit-id: a626b240ce
2013-11-12 12:42:16 -06:00
Brad Gonzales
afe5db430d
Issue #2506 fixed issues with shared distributed ingest.
...
Amend: Updated comment in StoreRetrievedData.
Removed separate messageing to clear BandwidthSubscriptions.
Add fix and test case for SBN deserialization with content following the ending xml tag.
Removed unneeded changes.
Added XmlWMOMessage class.
Change-Id: Iadef7070a42a10661ba9316a4900a071820296fd
Former-commit-id: 3c24f30ae8
[formerly 80fd8a2ad4
] [formerly fe15e874f7
] [formerly 3c24f30ae8
[formerly 80fd8a2ad4
] [formerly fe15e874f7
] [formerly e2fb158757
[formerly fe15e874f7
[formerly 0b667fbd94788a8a5b598ae5f5586d4b710518a4]]]]
Former-commit-id: e2fb158757
Former-commit-id: 458698d0a2
[formerly e802b866dd
] [formerly d52ca16c4b5860cf95891f8b6102ecc6f6d96bd1 [formerly 28d8aa5151
]]
Former-commit-id: 59d91bce9376593b0a8507fe193efa14b5311c75 [formerly f017bee2f2
]
Former-commit-id: 837664eea1
2013-11-08 15:29:05 -06:00
Mike Duff
27409bd03a
Issue #2450 - Send notifications to Notification Center when subscriptions expire.
...
peer review comments
Change-Id: I18eb322d73ee25f30cd1d032b403ea156bc63653
Former-commit-id: a3931125da
[formerly 2a97da896d
] [formerly 00bb57b481
] [formerly a3931125da
[formerly 2a97da896d
] [formerly 00bb57b481
] [formerly f3d07a9185
[formerly 00bb57b481
[formerly fc6fe49db0576c70e2068cd8fac125553806e4c0]]]]
Former-commit-id: f3d07a9185
Former-commit-id: 4a2d377291
[formerly ecaef4d639
] [formerly 34a98de0a9a5f176bd195b64d5d776dae48eef59 [formerly cc3846be0b
]]
Former-commit-id: 76ee46484cca60f12689d07b9d08fdf8fbbdbc0e [formerly 70fbb031a2
]
Former-commit-id: 8a8eb6ba4e
2013-11-06 12:23:09 -06:00
Benjamin Phillippe
32725adb31
Issue #1538 Moved data delivery specific web services out of registry plugins
...
-- Added registry federation admin page
-- Made registry service clients non-static
Change-Id: I9672f11b4886019dcd8834b4bae417a0aa4809ad
Former-commit-id: 311fa32377
[formerly 98b56cf02a
] [formerly a7e53870fb
] [formerly 311fa32377
[formerly 98b56cf02a
] [formerly a7e53870fb
] [formerly d8de923f8b
[formerly a7e53870fb
[formerly 0a67c8d68548ed8daa76d782ca3213956b984795]]]]
Former-commit-id: d8de923f8b
Former-commit-id: e9b49b288f
[formerly 7cb19682c1
] [formerly 628fd3115dbabe88f9d202b5257352679e5c521b [formerly 221d197c01
]]
Former-commit-id: 8e5cdd4d72fc495f2978e8dd7305962714cf62b8 [formerly 73c53ed846
]
Former-commit-id: c3f684e7fb
2013-11-01 09:20:00 -05:00
Dave Hladky
128a7c3854
Issue #2448 Fixed retrievals before activePeriod begins and after activePeriod expires.
...
Change-Id: I75269bad24731990720d30683ebf5f27344661f3
Former-commit-id: f79ba58a3a
[formerly 0eba787d3e
] [formerly 4227f3a59f
] [formerly f79ba58a3a
[formerly 0eba787d3e
] [formerly 4227f3a59f
] [formerly 9161962813
[formerly 4227f3a59f
[formerly 060e719f27c20f24bae9a5603cc51d90434b8fa4]]]]
Former-commit-id: 9161962813
Former-commit-id: ea17726866
[formerly ba31efaf03
] [formerly cc3ebf4fc7bd5a908a51ab6d7ccbfde59ee5656b [formerly d55d68fe5a
]]
Former-commit-id: 94e7a513a18ed9462a0201d4dece78d3907851ba [formerly 85003bf022
]
Former-commit-id: e30272c56b
2013-11-01 08:23:16 -05:00
Richard Peter
2baf599758
Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
...
Former-commit-id: 2b9cf07bfe
[formerly 5048d010f5
] [formerly 3139055873
] [formerly 2b9cf07bfe
[formerly 5048d010f5
] [formerly 3139055873
] [formerly b482eb2b48
[formerly 3139055873
[formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]]]
Former-commit-id: b482eb2b48
Former-commit-id: 7b0ad6bacc
[formerly fca3d73aa7
] [formerly f7dbb5f3661236898b603e2fdf7604e44f42274a [formerly 73462fa134
]]
Former-commit-id: 1019515624c081b6c221e0d3722489ce94b4ad06 [formerly 300f907c46
]
Former-commit-id: ab890140fb
2013-10-31 11:46:25 -05:00
Mike Duff
e48beadbc6
Issue #2292 - refactor and move overlap/duplicate checks to edex.
...
Peer review comments
Change-Id: I33df9cc7e368778943e25420d18b343781304c7a
Former-commit-id: fbcf271899
[formerly c1bd170f8a
] [formerly f123fa11f5
] [formerly fbcf271899
[formerly c1bd170f8a
] [formerly f123fa11f5
] [formerly 3fc811102e
[formerly f123fa11f5
[formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]]]
Former-commit-id: 3fc811102e
Former-commit-id: ce2afdf1b3
[formerly b0c54d7c17
] [formerly ac9b1be9e56f34d03174be87fbb48c2a6a187cdc [formerly 4da0648461
]]
Former-commit-id: ece01cf9cf7d6b3d925c922f4d1d6fe84edf0f17 [formerly 26ca1b4d72
]
Former-commit-id: 5ff3fe2791
2013-10-31 09:22:50 -05:00
Nate Jensen
86eed97dac
Merge "Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code" into development
...
Former-commit-id: 79eb4d400a
[formerly 411b909107
] [formerly d92bd5b69a
] [formerly 79eb4d400a
[formerly 411b909107
] [formerly d92bd5b69a
] [formerly 62a5739feb
[formerly d92bd5b69a
[formerly 05de1d88cdc4841483864a623346ad16b015d395]]]]
Former-commit-id: 62a5739feb
Former-commit-id: 937981d2f9
[formerly 90d99fe627
] [formerly 9bd9983d48f00002ef7fd475ecf0bf5a3403c4c1 [formerly 5c4d8b4310
]]
Former-commit-id: 5bb580041f80eda58be2a045874066d9241a9953 [formerly 68658bf885
]
Former-commit-id: fdb54d5810
2013-10-30 11:28:58 -05:00
Brad Gonzales
2c902ab8e7
Issue #2267 Remove java.nio.file dependencies from the SbnSimulator. Fixed handler setting for UFStatus in test env.
...
Change-Id: I8245eef53573b6596546e17a7900a1538455cee2
Former-commit-id: 250730c308
[formerly ac8136bd82
] [formerly f1480cfc62
] [formerly 250730c308
[formerly ac8136bd82
] [formerly f1480cfc62
] [formerly 6bc585aaf6
[formerly f1480cfc62
[formerly 6b8ff162be029543c8b9a7fcb3f8a359962aa6d7]]]]
Former-commit-id: 6bc585aaf6
Former-commit-id: bf1d2cb85a
[formerly 47690ea8d0
] [formerly 3ebdb55d0083b9e2bf2524a8b3b7cd9acaf899a2 [formerly aeccaa2329
]]
Former-commit-id: 9142f489480470f702fc2b3671eb72d8c6bfc6e1 [formerly 3b2127c103
]
Former-commit-id: af7e9dd4ef
2013-10-29 15:10:20 -05:00
Nate Jensen
89b3b81ab3
Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
...
Former-commit-id: a18df07586
[formerly 554a9cddf3
] [formerly f3143ba7b4
] [formerly a18df07586
[formerly 554a9cddf3
] [formerly f3143ba7b4
] [formerly 6880a18f1a
[formerly f3143ba7b4
[formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]]
Former-commit-id: 6880a18f1a
Former-commit-id: dced4c4d11
[formerly 19043faeaa
] [formerly df19f622b8df95f3d1447cd1c6c599d088ba4b1c [formerly f2751f017e
]]
Former-commit-id: 15fd50423e5c76bf2d7d7f54653759492ef97c8d [formerly e8c199f108
]
Former-commit-id: f2184b9379
2013-10-29 14:33:53 -05:00
Brad Gonzales
5615d18d89
Issue #2267 Refactored SbnSimulator into the sbnSimulator that runs
...
on the wfo boxes and a centralSbnSimulator that runs on the centralRegistry box.
Amend: Added excludes to sbnSimulator modes.
Updated FileUtil.listPaths to close the stream and use a LinkedList.
Added additional logging to SbnSimulator.
Change-Id: I89ff7d4afdd18ba51b8fd4812bb0b871ffc6d3af
Former-commit-id: e4f3bcf7ee
[formerly 5145ec3dfe
] [formerly bd7e5d8940
] [formerly e4f3bcf7ee
[formerly 5145ec3dfe
] [formerly bd7e5d8940
] [formerly f7a635ebef
[formerly bd7e5d8940
[formerly f9e593974811896dec76c512c2a76b5769c7a68a]]]]
Former-commit-id: f7a635ebef
Former-commit-id: 1449b0270b
[formerly 88a20aeae1
] [formerly c3d8e35cadd5927e79213f8c47d73c2feded21ff [formerly c36cbae577
]]
Former-commit-id: ca087473a45f31140f4f6226a46edb5c8687e49f [formerly 9215426279
]
Former-commit-id: 3ad2195c50
2013-10-23 18:44:41 -05:00
Benjamin Phillippe
b2a26d0ed7
Issue #1682 Refactored Registry querying to conform to EBXML 4.0 spec
...
Change-Id: If6d3579305afbb279057a264033736fc126b7849
Former-commit-id: 9bc1058db1
[formerly 12d23800c7
] [formerly a4e5cd5fd7
] [formerly 9bc1058db1
[formerly 12d23800c7
] [formerly a4e5cd5fd7
] [formerly ed23a786d6
[formerly a4e5cd5fd7
[formerly 5112ee9931a1678fee37dd725a28dd6fff1e7ec9]]]]
Former-commit-id: ed23a786d6
Former-commit-id: 40ccc490a4
[formerly 11b9198589
] [formerly 0d452b3343313b1a38b897d43d2a6fef69eb7481 [formerly a51d2fe3b9
]]
Former-commit-id: a22b289ad49b72602e9235ed65ad6a686c877ccb [formerly 63e7a68c79
]
Former-commit-id: fe57ae3597
2013-10-18 09:20:40 -05:00
Mike Duff
881e2eb62d
Issue #2386 - DD Front end refactor
...
Peer review comments
Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f
Former-commit-id: 335c8ba871
[formerly 9b4daacb26
] [formerly 33a5d36e1c
] [formerly 335c8ba871
[formerly 9b4daacb26
] [formerly 33a5d36e1c
] [formerly 83ec4daee2
[formerly 33a5d36e1c
[formerly a72c1f9ad09594ddc0c0e78e78c9fccd95fd49ff]]]]
Former-commit-id: 83ec4daee2
Former-commit-id: 5913f21dd6
[formerly c4e3b900c9
] [formerly 177f4fe62912fc601fc1693ee37ceb0e687c8033 [formerly 4764147f67
]]
Former-commit-id: c66a8efe9c3d8a5536c47e3a9f958394809acd02 [formerly ffbbf04f05
]
Former-commit-id: 14d907ac01
2013-10-14 15:42:28 -05:00
Brad Gonzales
c49808a723
Issue #1797 Refactored registry Time objects to simplify serialization issues.
...
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
Fix GriddedTime addCycles when cycles are empty.
Change-Id: I9fa27178e5f59252cb872314493256be7f038890
Former-commit-id: 718fea35a1
[formerly ac3d87c397
] [formerly 25710edd9e
] [formerly 718fea35a1
[formerly ac3d87c397
] [formerly 25710edd9e
] [formerly bc87f2a168
[formerly 25710edd9e
[formerly a01619f78bac065e7d42e28882157778aba09b75]]]]
Former-commit-id: bc87f2a168
Former-commit-id: ff0ec3ddc6
[formerly 5825fa41d6
] [formerly 80e942a0903682ada751fb617334acdf3cd8b6d9 [formerly 897fdfc2f6
]]
Former-commit-id: 0feb323650cbcacede4cba0bae1d36a86174332f [formerly 32dce367a9
]
Former-commit-id: feef0a0b55
2013-10-11 10:36:53 -05:00
Brad Gonzales
568f5ba997
Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes.
...
Change-Id: I601b306bf944d959da05af9277ba80e184d98e30
Former-commit-id: 094c9dc6a7
[formerly 59f22b866a
] [formerly 73e757c284
] [formerly 094c9dc6a7
[formerly 59f22b866a
] [formerly 73e757c284
] [formerly 61448cc04a
[formerly 73e757c284
[formerly f776626738e4cc995bb16e87b8da66ff90289bd8]]]]
Former-commit-id: 61448cc04a
Former-commit-id: 74df786a0b
[formerly aff77aa148
] [formerly 3686551f045361598f2adaa4edad79f481b0d4e1 [formerly 55d242b86d
]]
Former-commit-id: 9fb3511af54c1ee9e26fe40f8ed5f7f146889f9c [formerly b24299e301
]
Former-commit-id: af191df5cf
2013-10-09 17:58:12 -05:00
Dave Hladky
e103fa9c58
Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects
...
Former-commit-id: 521cb3a61d
[formerly 4867082be1
] [formerly fbe4078bc5
] [formerly 521cb3a61d
[formerly 4867082be1
] [formerly fbe4078bc5
] [formerly ad1bb73c70
[formerly fbe4078bc5
[formerly c299ed7a5bb02980ecb30b0ab38752d2878d50a7]]]]
Former-commit-id: ad1bb73c70
Former-commit-id: 62c7b8a83b
[formerly 445d836fe6
] [formerly 91f21451dc2485422212959320afb62a1b8190e7 [formerly 093b41499b
]]
Former-commit-id: ad72de9511e44f91521120647a5a70b0caacc31f [formerly 7807722694
]
Former-commit-id: de24cf3b9a
2013-10-08 10:25:36 -05:00
Brad Gonzales
0c28bac66b
Issue #2267 Shared Subscription fixes. DataDelivery Port environment standardization. Logging updates.
...
Amend: Refactored WMO header applier.
Fixes for WMO header applier.
Updated dataDeliveryRetrieval.xml with correct wmo header pattern.
Removed manual ingest from registry mode.
Simplified data delivery distribution matching pattern.
Added serialize test for wfs response.
Updated comments.
Moved WfsRetrievalResponse to com.raytheon.uf.edex.datadelivery.retrieval package.
Added WfsRetrievalResponse to Jaxb unmarshalable classes in DeserializeRetrievedDataFromIngest.
HibernateBandwidthInitializer.executeAfterRegistryInit(), in NCF mode schedules shared subs.
Change-Id: I0278339701f5f55491120c35d80cbd6d3dcc84f7
Former-commit-id: 08817277b4
[formerly dc45b582e1
] [formerly 21acb75f24
] [formerly 08817277b4
[formerly dc45b582e1
] [formerly 21acb75f24
] [formerly a6540d69ea
[formerly 21acb75f24
[formerly 8bf8efa14520aaba532ca7a2e82e4c1fa24adca8]]]]
Former-commit-id: a6540d69ea
Former-commit-id: cb185b2395
[formerly e129c33bee
] [formerly 66f28211c1048177be60ab32e1b6360946fea466 [formerly 9d981ab2f3
]]
Former-commit-id: 47936db769a40ca23057acc514918317e8c3fd70 [formerly 0f3b5172d4
]
Former-commit-id: 0313e9c835
2013-10-07 17:06:38 -05:00
Dave Hladky
89e5b5116c
Issue #1797 Separation of gridded time and abstract time object
...
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63
Former-commit-id: 7d43c5b7f9
[formerly 4d4d93fc0a
] [formerly e0ec10d073
] [formerly 7d43c5b7f9
[formerly 4d4d93fc0a
] [formerly e0ec10d073
] [formerly 1733834e74
[formerly e0ec10d073
[formerly cdf2b6dd5a5b4a12cf12e6d4d254b5e40acfcef5]]]]
Former-commit-id: 1733834e74
Former-commit-id: 87574fd68a
[formerly 21239525ea
] [formerly 965f4a1eb5886ed77447541de327726ef9ab34a7 [formerly 89c341509c
]]
Former-commit-id: b6b1dc8bacb08fc8a37391ca8c9d065363a89f96 [formerly 3ba8fd56f7
]
Former-commit-id: ab9c5af250
2013-10-04 10:36:27 -05:00
Dave Hladky
9ca16bf485
Issue #2386 Backend work for adding multiple types to Subscription overlap rules
...
Change-Id: I0779dc7987031999b80ab0859c7f33dca20a5c17
Former-commit-id: dd6074c6dc
[formerly b9f8daf751
] [formerly d34882eb49
] [formerly dd6074c6dc
[formerly b9f8daf751
] [formerly d34882eb49
] [formerly e29d10ba4f
[formerly d34882eb49
[formerly 449c584afc46257671808b921847a621e7020bcf]]]]
Former-commit-id: e29d10ba4f
Former-commit-id: 0565c63bf6
[formerly 4d963954b1
] [formerly 1ecfea5f1843dfbb7d5f937257854d66e55d7645 [formerly d9f06e5bea
]]
Former-commit-id: d68919e5a2e93e37517061b81cc7721032b12ab2 [formerly 5672fc86c9
]
Former-commit-id: 1955dbaf44
2013-09-26 11:12:00 -05:00
Brad Gonzales
0fe1c92390
Issue #2383 Updates to fix issues with adhoc point queries and bandwith manager tests.
...
Amend: Reverted BandwidthDaoUtil.setAdhocMostRecentUrlAndTime to Dave's fixes, with one
minor change. Added additional handling to start and end bucket calculation in
InMemoryBandwidthBucketDao. Addtional logging. Removed exception logging of
subscriptions.
Change-Id: Ie51c0accd7f39d31379e49e97542bae75bde5a1c
Former-commit-id: b1ea0a3f5c
[formerly b5669581d8
] [formerly c81825ce57
] [formerly b1ea0a3f5c
[formerly b5669581d8
] [formerly c81825ce57
] [formerly d597d7f653
[formerly c81825ce57
[formerly 148cc6d96ed17127590827d166325c4748384689]]]]
Former-commit-id: d597d7f653
Former-commit-id: 3763f1f61d
[formerly e6247e83da
] [formerly 623ec5f1c9962e7191d54c8433a3ccc428c7764e [formerly 6ddb913829
]]
Former-commit-id: c6d1206388ee7ce9311593021810ebf0a6dcd802 [formerly 3ca693fb89
]
Former-commit-id: 82c2f1fcc0
2013-09-19 12:54:31 -05:00
Ben Steffensmeier
b55fcceac9
Issue #2309 Fix envelope intersection for UKMET data on North American scale.
...
Former-commit-id: 9d2016e0ad
[formerly 926c535eee
] [formerly 0c64f33213
] [formerly 9d2016e0ad
[formerly 926c535eee
] [formerly 0c64f33213
] [formerly b2475e3982
[formerly 0c64f33213
[formerly 325a28c5793bacdeddba09a666f8beb4dafe92df]]]]
Former-commit-id: b2475e3982
Former-commit-id: b4a8486f36
[formerly 145dbefdea
] [formerly 30612bedc74e9a655b8fe7acc0070b4c9fb9cc3d [formerly 45db8fb699
]]
Former-commit-id: 4151de2aabc9db54da0349c22ae45086da940d2e [formerly 4ccc511d91
]
Former-commit-id: 9cfd4ddc89
2013-09-13 15:00:50 -05:00
Dave Hladky
dba344097f
Merge branch 'dd_pre_release_2.1' into development
...
Former-commit-id: 38f6176f70
[formerly e4e75ec268
] [formerly f1fc14ce90
] [formerly 38f6176f70
[formerly e4e75ec268
] [formerly f1fc14ce90
] [formerly 329a40852c
[formerly f1fc14ce90
[formerly 076dd7338edcf45a33f6485f190831acd344b954]]]]
Former-commit-id: 329a40852c
Former-commit-id: a2b6ab3141
[formerly 2f3f1d88b4
] [formerly 5ff444ae7c3ca07d82331aa307c1c116792a0723 [formerly b0b51dbcb6
]]
Former-commit-id: c0d14bf8ea3b3ca1ff6a726bafb3ca46b4f53dd6 [formerly 1348b91f27
]
Former-commit-id: 898e63c10e
2013-09-11 15:07:23 -05:00
Nate Jensen
42160cfecd
Merge "Issue #2352 - Data Browser Must Check For Subscriptions Belonging to the Local Site" into dd_pre_release_2.1
...
Former-commit-id: 6d21193342
[formerly b8eec709fe
] [formerly 83fc7113b1
] [formerly 6d21193342
[formerly b8eec709fe
] [formerly 83fc7113b1
] [formerly d1f699bd51
[formerly 83fc7113b1
[formerly 89507c3f6e398f9068e75c3049266afd1ed034a2]]]]
Former-commit-id: d1f699bd51
Former-commit-id: 8fcd6375e5
[formerly f39209d6e5
] [formerly c55e7887f190b67aff4b2de770a602b2d294cd25 [formerly 38dcc46cf6
]]
Former-commit-id: f344fe6998b983875c9eb4550cc6c6fc2b597aa6 [formerly 2cc6a54e61
]
Former-commit-id: d486408e44
2013-09-11 11:55:10 -05:00
Mike Duff
bf44015bd7
Issue #2352 - Data Browser Must Check For Subscriptions Belonging to the Local Site
...
Change-Id: I23392906a7d829852af2991dd096d4b5e76765aa
Former-commit-id: f20e2d7255
[formerly b569410bc4
] [formerly 89342e59b9
] [formerly f20e2d7255
[formerly b569410bc4
] [formerly 89342e59b9
] [formerly b8d2c6cffc
[formerly 89342e59b9
[formerly 5b4c9794eb396f02cdf024d2df2089add4719910]]]]
Former-commit-id: b8d2c6cffc
Former-commit-id: cfea1337df
[formerly 2465a0625b
] [formerly 56c19ed9ef7e723c3bc704490a3c703ec91ab695 [formerly 13751ede70
]]
Former-commit-id: c1b29b66f9b885c7a8ef209ae2a701f32152c470 [formerly ed8fa698dd
]
Former-commit-id: 2b81983331
2013-09-11 09:47:04 -05:00
Brad Gonzales
f6e5e4336f
Issue #2344 Fixed HibernateBandwidthInitializerTest.
...
Amend: Removed officeID change to BaseSubscriptionFixture.
Change-Id: Ib3065684aa88cdcde000239d9202d5d43259f43e
Former-commit-id: b2d9173ecc
[formerly a206fb5b21
] [formerly 695aa9e609
] [formerly b2d9173ecc
[formerly a206fb5b21
] [formerly 695aa9e609
] [formerly d0ccc11f58
[formerly 695aa9e609
[formerly 69b7fc7281a4cc266b7e6ca6f0adff00b3658957]]]]
Former-commit-id: d0ccc11f58
Former-commit-id: bb5035c8df
[formerly b82e892312
] [formerly 96a7a190ba5eec309db621dd8f0378302b43f626 [formerly 8fe9dd0435
]]
Former-commit-id: 0cd99561681115d2db1671bc3117b74cb7a2414f [formerly da4b44cdc4
]
Former-commit-id: b9f0477adf
2013-09-09 13:11:18 -05:00
David Gillingham
8d12a10591
Issue #2307 : Remove calls to PythonScript constructor without ClassLoader
...
argument, fix IscMosaic.
Change-Id: Iff29b2790fd1c6d5f5b829f6b35ff31829cdc907
Former-commit-id: 65f92a6025
[formerly 936326f11e
] [formerly e526e7a82c
] [formerly 65f92a6025
[formerly 936326f11e
] [formerly e526e7a82c
] [formerly 47878a4318
[formerly e526e7a82c
[formerly 85609a4bf9072ae41dbafbc1b874efbcd5bd21a4]]]]
Former-commit-id: 47878a4318
Former-commit-id: 97661398bb
[formerly 73f1695e2a
] [formerly dde1dc8262ed35ef2f642110710808e6ac2477a5 [formerly 28e5aaabca
]]
Former-commit-id: c4ca0d2d825bcfe42bb8f8b06cd36519809d09d2 [formerly c0f4022abd
]
Former-commit-id: 2e92a5fce1
2013-09-06 10:16:31 -05:00
Ben Steffensmeier
25bb80b2c1
Issue #2316 Remove tests for old airep/pirep plugins.
...
Change-Id: I5503e6bd065e4daa4620c35d0a173a7cbb5bfe44
Former-commit-id: f1ccde3c90
[formerly abd1172053
] [formerly b856f454ff
] [formerly f1ccde3c90
[formerly abd1172053
] [formerly b856f454ff
] [formerly e091a9d18d
[formerly b856f454ff
[formerly 8d7e812f92c48fd57a52e79433de9f094f675fe3]]]]
Former-commit-id: e091a9d18d
Former-commit-id: 79d2e6e3c7
[formerly 5e4d6b6d82
] [formerly 6144cff069c97e9ee1f60663ef18cfd2e72e9b90 [formerly f5246117a9
]]
Former-commit-id: 20756125395d13827cf2f2549acdb17852079da5 [formerly e6b1e34f99
]
Former-commit-id: d2840835b9
2013-09-05 16:27:02 -05:00
Richard Peter
1468ba70ba
Merge "Issue #2298 : Make getPluginName abstract" into development
...
Former-commit-id: bd3d8fc900
[formerly f8134d2e7a
] [formerly 4b4f59ca37
] [formerly bd3d8fc900
[formerly f8134d2e7a
] [formerly 4b4f59ca37
] [formerly 465d41c2e9
[formerly 4b4f59ca37
[formerly 8111c47024fb284c31faf473037d6b401ff17e3a]]]]
Former-commit-id: 465d41c2e9
Former-commit-id: 02cdcdca4f
[formerly 5b1c3e4146
] [formerly 12feebf77bbc8ceb0f34dcc11d7cb2a098e33dc4 [formerly 62797681f1
]]
Former-commit-id: e8a209dfdccebae956238fb982f092c92d2658c2 [formerly ea33eabfc5
]
Former-commit-id: 0bd1515ced
2013-09-03 12:32:30 -05:00
Richard Peter
92a830f293
Issue #2298 : Make getPluginName abstract
...
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae
Former-commit-id: 713d540d81
[formerly ff660a78c7
] [formerly 592218edb8
] [formerly 713d540d81
[formerly ff660a78c7
] [formerly 592218edb8
] [formerly 7175e78cf7
[formerly 592218edb8
[formerly 54356ea774bfab26b85aff317fc759de41e259d1]]]]
Former-commit-id: 7175e78cf7
Former-commit-id: 7f91e8dbb4
[formerly 9aec8b3f88
] [formerly fd064b084aa46ae3c60ddfdc327034162847bcf0 [formerly ae956e3b4b
]]
Former-commit-id: 6d53959601baa239b570e43fa359a5ce33b1ee57 [formerly beb492620b
]
Former-commit-id: e154f87cf4
2013-09-03 11:51:27 -05:00