summary refs log tree commit diff
path: root/synapse/util (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release-v1.15.0' of github.com:matrix-org/synapse into dinsic-r...Andrew Morgan2020-06-242-1/+13
|\
| * Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-051-1/+1
| * Speed up processing of federation stream RDATA rows.Erik Johnston2020-05-271-0/+12
* | Merge branch 'release-v1.14.0' of github.com:matrix-org/synapse into dinsic-r...Andrew Morgan2020-06-1010-175/+225
|\|
| * Don't apply cache factor to event cache. (#7578)Erik Johnston2020-05-271-0/+4
| * Fix stacktrace mangling in `patch_inline_callbacks` (#7554)Richard van der Hoff2020-05-221-2/+7
| * remove miscellaneous PY2 codeRichard van der Hoff2020-05-152-27/+8
| * remove to_asciiRichard van der Hoff2020-05-151-19/+1
| * Remove `exception_to_unicode`Richard van der Hoff2020-05-151-36/+0
| * Strictly enforce canonicaljson requirements in a new room version (#7381)Patrick Cloke2020-05-141-1/+1
| * Allow configuration of Synapse's cache without using synctl or environment va...Amber Brown2020-05-117-92/+206
* | Merge branch 'release-v1.13.0' of github.com:matrix-org/synapse into dinsic-r...Andrew Morgan2020-06-104-64/+122
|\|
| * Speed up fetching device lists changes in sync.Erik Johnston2020-05-051-4/+15
| * Extend StreamChangeCache to support multiple entities per stream ID (#7303)Richard van der Hoff2020-04-221-46/+71
| * On catchup, process each row with its own stream id (#7286)Richard van der Hoff2020-04-201-0/+3
| * Rewrite prune_old_outbound_device_pokes for efficiency (#7159)Richard van der Hoff2020-03-301-1/+20
| * Clean up some LoggingContext stuff (#7120)Richard van der Hoff2020-03-242-20/+20
* | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Andrew Morgan2020-03-241-1/+1
|\|
| * Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-211-1/+1
* | Reduce amount of logging at INFO level. (#6862)Andrew Morgan2020-03-231-1/+1
|\|
| * Reduce amount of logging at INFO level. (#6862)Erik Johnston2020-02-061-1/+1
* | Fix stacktraces when using ObservableDeferred and async/await (#6836)Andrew Morgan2020-03-231-0/+4
|\|
| * Fix stacktraces when using ObservableDeferred and async/await (#6836)Erik Johnston2020-02-031-0/+4
* | Validate client_secret parameter (#6767)Andrew Morgan2020-03-231-2/+5
|\|
| * Validate client_secret parameter (#6767)Andrew Morgan2020-01-241-0/+17
* | Merge pull request #6724 from matrix-org/rav/log_saml_attributesAndrew Morgan2020-03-232-17/+48
|\|
| * Log saml assertions rather than the whole responseRichard van der Hoff2020-01-161-0/+13
| * move batch_iter to a separate moduleRichard van der Hoff2020-01-162-17/+35
* | Merge pull request #6688 from matrix-org/rav/module_api_extensionsAndrew Morgan2020-03-231-1/+1
|\|
| * Handle `config` not being set for synapse plugin modulesRichard van der Hoff2020-01-121-1/+1
* | Persist auth/state events at backwards extremities when we fetch them (#6526)Andrew Morgan2020-03-191-2/+2
|\|
| * Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-161-2/+2
* | look up cross-signing keys from the DB in bulk (#6486)Andrew Morgan2020-03-191-1/+1
|\|
| * look up cross-signing keys from the DB in bulk (#6486)Hubert Chathi2019-12-121-1/+1
* | Merge pull request #6506 from matrix-org/erikj/remove_snapshot_cacheAndrew Morgan2020-03-191-94/+0
|\|
| * Remove SnapshotCache in favour of ResponseCacheErik Johnston2019-12-091-94/+0
* | Fix inaccurate per-block metrics (#6491)Andrew Morgan2020-03-191-42/+18
|\|
| * Fix inaccurate per-block metrics (#6491)Richard van der Hoff2019-12-091-42/+18
* | Merge pull request #6484 from matrix-org/erikj/port_sync_handlerAndrew Morgan2020-03-191-6/+17
|\|
| * Port SyncHandler to async/awaitErik Johnston2019-12-051-6/+17
* | Replace instance variations of homeserver with correct case/spacing (#6357)Andrew Morgan2020-03-181-1/+1
|\|
| * Replace instance variations of homeserver with correct case/spacingAndrew Morgan2019-11-121-1/+1
* | Fix LruCache callback deduplication (#6213)Andrew Morgan2020-03-181-11/+37
|\|
| * Fix LruCache callback deduplication (#6213)V024602019-11-071-11/+37
* | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2020-03-164-6/+6
|\|
| * Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-314-6/+6
* | Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptorAndrew Morgan2020-03-161-4/+5
|\|
| * Clarify docstringErik Johnston2019-10-301-0/+4
| * Make ObservableDeferred.observe() always return deferred.Erik Johnston2019-10-301-5/+2
* | Handle FileNotFound error in checking git repository version (#6284)Andrew Morgan2020-03-161-4/+6
|\|
| * Handle FileNotFound error in checking git repository version (#6284)Andrew Morgan2019-10-301-4/+6
* | Merge pull request #6279 from matrix-org/erikj/federation_server_async_awaitAndrew Morgan2020-03-161-4/+3
|\|
| * Make concurrently_execute work with async/awaitErik Johnston2019-10-291-4/+3
* | Merge pull request #6263 from matrix-org/erikj/caches_return_deferredsAndrew Morgan2020-03-161-5/+4
|\|
| * Update docstringErik Johnston2019-10-291-3/+2
| * Quick fix to ensure cache descriptors always return deferredsErik Johnston2019-10-281-2/+2
* | Merge branch 'master' into developAndrew Morgan2020-02-261-0/+29
|\|
| * Add maybe_awaitable and fix __init__ bugsErik Johnston2019-10-111-0/+29
* | Merge pull request #6127 from matrix-org/erikj/patch_innerAndrew Morgan2020-02-261-0/+219
|\|
| * Fixup commentsErik Johnston2019-10-101-3/+3
| * Fix py3.5Erik Johnston2019-10-101-1/+1
| * Fix py3.5Erik Johnston2019-10-101-1/+1
| * sortErik Johnston2019-10-101-3/+1
| * Appease mypyErik Johnston2019-10-101-13/+18
| * Add comentsErik Johnston2019-10-101-5/+25
| * Log correct contextErik Johnston2019-10-101-6/+6
| * Test for sentinel commitErik Johnston2019-10-101-2/+19
| * Move patch_inline_callbacks into synapse/Erik Johnston2019-10-101-0/+179
* | add some metrics on the federation sender (#6160)Andrew Morgan2020-02-261-2/+4
|\|
| * add some metrics on the federation sender (#6160)Richard van der Hoff2019-10-031-2/+4
* | Fix up some typechecking (#6150)Andrew Morgan2020-02-265-8/+33
|\|
| * Fix up some typechecking (#6150)Amber Brown2019-10-025-8/+33
* | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timingsAndrew Morgan2020-02-261-1/+1
|\|
| * Fix errors storing large retry intervals.Erik Johnston2019-10-021-1/+1
* | Merge pull request #6069 from matrix-org/rav/fix_attribute_mappingAndrew Morgan2020-02-251-1/+19
|\|
| * Merge branch 'develop' into rav/fix_attribute_mappingRichard van der Hoff2019-09-193-21/+68
| |\
| * | Fix a bug with saml attribute maps.Richard van der Hoff2019-09-191-1/+19
* | | Add 'failure_ts' column to 'destinations' table (#6016)Andrew Morgan2020-02-251-1/+15
|\ \ \ | | |/ | |/|
| * | Add 'failure_ts' column to 'destinations' table (#6016)Richard van der Hoff2019-09-171-1/+15
* | | Remove the cap on federation retry interval. (#6026)Andrew Morgan2020-02-251-2/+2
|\| |
| * | Remove the cap on federation retry interval. (#6026)Richard van der Hoff2019-09-121-2/+2
* | | Fix bug in calculating the federation retry backoff period (#6025)Andrew Morgan2020-02-251-2/+3
|\| |
| * | Fix bug in calculating the federation retry backoff period (#6025)Richard van der Hoff2019-09-121-2/+3
* | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2020-02-251-0/+33
|\| |
| * | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2019-09-111-0/+33
* | | Clean up some code in the retry logic (#6017)Andrew Morgan2020-02-251-16/+13
|\| |
| * | Clean up some code in the retry logic (#6017)Richard van der Hoff2019-09-111-16/+13
| * | Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937)Andrew Morgan2019-08-301-33/+0
* | | Revert "Use the v2 lookup API for 3PID invites (#5897)"Andrew Morgan2020-02-241-33/+0
* | | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2020-02-241-0/+33
|\| |
| * | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2019-08-281-0/+33
* | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupAndrew Morgan2020-02-201-3/+5
|\| |
| * | Retry well-known lookup before expiry.Erik Johnston2019-08-131-3/+5
| |/
| * Add kwargs and docBrendan Abolivier2019-07-291-2/+4
| * Add ability to pass arguments to looping callsBrendan Abolivier2019-07-291-2/+2
* | Fix some error cases in the caching layer. (#5749)Andrew Morgan2020-02-191-32/+42
|\|
| * Fix some error cases in the caching layer. (#5749)Richard van der Hoff2019-07-251-32/+42
* | Add a prometheus metric for active cache lookups. (#5750)Andrew Morgan2020-02-192-2/+33
|\|
| * Add a prometheus metric for active cache lookups. (#5750)Richard van der Hoff2019-07-242-2/+33
* | Replace returnValue with return (#5736)Andrew Morgan2020-02-196-15/+13
|\|
| * Replace returnValue with return (#5736)Amber Brown2019-07-236-15/+13
* | Cache get_version_string.Andrew Morgan2020-02-191-2/+21
|\|
| * Cache get_version_string.Erik Johnston2019-07-221-2/+21
* | Fixes to the federation rate limiter (#5621)Andrew Morgan2020-02-171-8/+8
|\|
| * Fixes to the federation rate limiter (#5621)Richard van der Hoff2019-07-051-8/+8
* | Improve the backwards compatibility re-exports of synapse.logging.context (#5...Andrew Morgan2020-02-173-5/+61
|\|
| * Improve the backwards compatibility re-exports of synapse.logging.context (#5...Amber Brown2019-07-053-5/+61
* | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Andrew Morgan2020-02-1412-962/+26
|\|
| * Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-0412-962/+26
* | Fix 'utime went backwards' errors on daemonization. (#5609)Andrew Morgan2020-02-141-4/+13
|\|
| * Fix 'utime went backwards' errors on daemonization. (#5609)Richard van der Hoff2019-07-031-4/+13
* | Fix a number of "Starting txn from sentinel context" warnings (#5605)Andrew Morgan2020-02-141-1/+7
|\|
| * Fix a number of "Starting txn from sentinel context" warnings (#5605)Richard van der Hoff2019-07-031-1/+7
* | Fix media repo breaking (#5593)Andrew Morgan2020-02-141-2/+7
|\|
| * Fix media repo breaking (#5593)Amber Brown2019-07-021-2/+7
* | Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2020-02-141-1/+1
|\|
| * Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2019-06-251-1/+1
* | Merge pull request #5499 from matrix-org/rav/cleanup_metricsAndrew Morgan2020-02-141-7/+39
|\|
| * Avoid raising exceptions in metricsRichard van der Hoff2019-06-241-8/+14
| * Merge branch 'develop' into rav/cleanup_metricsRichard van der Hoff2019-06-2427-314/+317
| |\
| * | Sanity-checking for metrics updatesRichard van der Hoff2019-06-191-7/+33
* | | Run Black. (#5482)Andrew Morgan2020-02-133-4/+4
|\ \ \ | | |/ | |/|
| * | Run Black. (#5482)Amber Brown2019-06-2027-314/+317
| |/
* | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-1127-317/+321
* | Validate client_secret parameter according to spec (#20)Andrew Morgan2020-01-221-0/+14
* | Add kwargs and docBrendan Abolivier2019-07-291-2/+4
* | Add ability to pass arguments to looping callsBrendan Abolivier2019-07-291-2/+2
* | Merge branch 'master' into dinsicBrendan Abolivier2019-06-122-27/+50
|\|
| * Call RetryLimiter correctly (#5340)Richard van der Hoff2019-06-041-1/+6
| * Avoid rapidly backing-off a server if we ignore the retry intervalRichard van der Hoff2019-06-031-23/+37
| * Improve logging for logcontext leaks. (#5288)Richard van der Hoff2019-05-291-9/+13
* | Merge branch 'babolivier/per_room_profiles' into dinsic dinsic_2019-05-17Brendan Abolivier2019-05-173-32/+35
|\|
| * Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-151-32/+15
| * Merge pull request #5183 from matrix-org/erikj/async_serialize_eventErik Johnston2019-05-151-0/+19
| |\
| | * Update docstring with correct return typeErik Johnston2019-05-151-1/+1
| | * Allow client event serialization to be asyncErik Johnston2019-05-141-0/+19
| * | comment about user_joined_roomRichard van der Hoff2019-05-141-0/+1
| |/
* | Merge branch 'release-v0.99.4' into dinsic dinsic_2019-05-14Brendan Abolivier2019-05-141-2/+7
|\|
| * Merge branch 'master' into developRichard van der Hoff2019-05-031-2/+7
| |\
| | * Use SystemRandom for token generationRichard van der Hoff2019-05-031-2/+7
* | | Merge branch 'develop' into dinsicAndrew Morgan2019-04-152-3/+58
|\| |
| * | Remove periods from copyright headers (#5046)Andrew Morgan2019-04-111-1/+1
| * | Fix disappearing exceptions in manhole. (#5035)Richard van der Hoff2019-04-101-2/+57
| |/
* | Prevent exception when hs or shadow_hs missing (#5012) dinsic_2019-04-04_2Michael Kaye2019-04-041-2/+2
* | FixupsErik Johnston2019-03-151-1/+4
* | Merge branch 'master' of github.com:matrix-org/synapse into erikj/dinsic-merg...Erik Johnston2019-03-154-8/+211
|\|
| * Add a caching layer to .well-known responses (#4516)Richard van der Hoff2019-01-301-0/+161
| * Merge pull request #4486 from xperimental/workaround-4216Richard van der Hoff2019-01-301-1/+4
| |\
| | * Implement workaround for login error.Robert Jacob2019-01-301-1/+4
| * | Make linearizer more quiet (#4507)Amber Brown2019-01-291-5/+5
| |/
| * Fix incorrect logcontexts after a Deferred was cancelled (#4407)Richard van der Hoff2019-01-171-1/+3
| * Fix UnicodeDecodeError when postgres is not configured in english (#4253)Richard van der Hoff2018-12-041-1/+38
* | Merge branch 'dinsic_anoa/info_split' of github.com:matrix-org/synapse into d...Andrew Morgan2019-02-271-1/+1
|\ \
| * | Update synapse/util/threepids.pyRichard van der Hoff2019-02-251-1/+1
* | | Check shadow_hs as well as hs during 3pid regAndrew Morgan2019-02-271-6/+8
|/ /
* | Use internal-info for identity server. Block reg on fields dinsic_2019-02-19-beta11Andrew Morgan2019-02-191-2/+10
* | merge master into dinsic, again...Matthew Hodgson2018-11-039-120/+306
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa...Erik Johnston2018-10-253-54/+76
| |\
| | * Correctly account for cpu usage by background threads (#4074)Richard van der Hoff2018-10-231-51/+69
| | * Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on...Amber Brown2018-10-201-1/+3
| | * Fix manhole on py3 (pt 2) (#4067)Amber Brown2018-10-191-0/+2
| | * make a bytestringAmber Brown2018-10-191-2/+2
| * | Anchor returned regex to start and end of stringErik Johnston2018-10-191-2/+6
| * | Add config option to control alias creationErik Johnston2018-10-191-0/+21
| |/
| * Remove unnecessary extra function call layerErik Johnston2018-10-081-16/+13
| * Use errback pattern and catch async failuresErik Johnston2018-10-081-14/+29
| * Log looping call exceptionsErik Johnston2018-10-051-1/+18
| * Correctly match 'dict.pop' apiErik Johnston2018-10-011-3/+11
| * Don't update eviction metrics on explicit removalErik Johnston2018-10-011-5/+0
| * Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cacheRichard van der Hoff2018-09-281-4/+37
| |\
| | * Include eventid in log lines when processing incoming federation transactions...Richard van der Hoff2018-09-271-4/+37
| * | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cacheRichard van der Hoff2018-09-261-10/+17
| |\|
| | * Log which cache is throwing exceptionsRichard van der Hoff2018-09-261-10/+17
| | * Fix ExpiringCache.__len__ to be accurateErik Johnston2018-09-261-10/+7
| * | Fix ExpiringCache.__len__ to be accurateErik Johnston2018-09-211-12/+9
| * | Add a five minute cache to get_destination_retry_timingsErik Johnston2018-09-211-0/+13
| * | Make ExpiringCache slightly more performantErik Johnston2018-09-211-1/+5
| |/
| * Fix some instances of ExpiringCache not expiring cache itemsErik Johnston2018-09-211-1/+0
| * Improve the logging when handling a federation transaction (#3904)Richard van der Hoff2018-09-191-1/+1
| * Replace custom DeferredTimeoutError with defer.TimeoutErrorErik Johnston2018-09-191-9/+3
| * Run canceller first to allow it to generate correct errorErik Johnston2018-09-191-2/+5
| * Update to use new timeout function everywhere.Erik Johnston2018-09-191-54/+19
| * Fix timeout functionErik Johnston2018-09-151-1/+2
| * Add an awful secondary timeout to fix wedged requestsErik Johnston2018-09-141-0/+51
| * Add in flight real time metrics for Measure blocksErik Johnston2018-09-141-0/+22
| * Change the manhole SSH key to have more bitsErik Johnston2018-09-111-13/+31
* | merge in masterMatthew Hodgson2018-10-2212-219/+249
|\|
| * Fix exceptions when a connection is closed before we read the headersRichard van der Hoff2018-08-201-1/+3
| * Robustness fix for logcontext filterRichard van der Hoff2018-08-201-1/+7
| * Port over enough to get some sytests running on Python 3 (#3668)Amber Brown2018-08-203-8/+29
| * Merge branch 'rav/fix_linearizer_cancellation' into developRichard van der Hoff2018-08-101-43/+68
| |\
| | * Fix linearizer cancellation on twisted < 18.7Richard van der Hoff2018-08-101-43/+68
| * | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-105-4/+4
| |/
| * Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-021-3/+3
| * fix invalidationRichard van der Hoff2018-07-271-1/+1
| * Rewrite cache list decoratorRichard van der Hoff2018-07-271-67/+64
| * Fix some looping_call calls which were broken in #3604Richard van der Hoff2018-07-261-1/+1
| * Test and fix support for cancellation in LinearizerRichard van der Hoff2018-07-201-6/+22
| * Combine Limiter and LinearizerRichard van der Hoff2018-07-201-89/+10
| * Improvements to the LimiterRichard van der Hoff2018-07-201-13/+20
| * Add a sleep to the Limiter to fix stack overflows.Richard van der Hoff2018-07-201-3/+20
| * Don't spew errors because we can't save metrics (#3563)Amber Brown2018-07-192-6/+24
| * Make Distributor run its processes as a background processRichard van der Hoff2018-07-181-26/+18
| * Run things as background processesRichard van der Hoff2018-07-182-1/+9
* | Merge remote-tracking branch 'origin/master' into dinsicDavid Baker2018-07-1922-141/+241
|\|
| * Use efficient .intersectionErik Johnston2018-07-171-4/+1
| * Fix perf regression in PR #3530Erik Johnston2018-07-171-1/+6
| * Merge pull request #3530 from matrix-org/erikj/stream_cacheAmber Brown2018-07-171-8/+1
| |\
| | * Don't return unknown entities in get_entities_changedErik Johnston2018-07-131-8/+1
| * | Make FederationRateLimiter queue requests properlyRichard van der Hoff2018-07-131-10/+23
| |/
| * Reduce set building in get_entities_changedRichard van der Hoff2018-07-121-8/+12
| * Attempt to include db threads in cpu usage stats (#3496)Richard van der Hoff2018-07-101-2/+21
| * Refactor logcontext resource usage tracking (#3501)Richard van der Hoff2018-07-102-49/+120
| * run isortAmber Brown2018-07-0922-73/+71
* | Merge remote-tracking branch 'origin/master' into dinsicDavid Baker2018-07-1710-82/+118
|\|
| * Attempt to be more performant on PyPy (#3462)Amber Brown2018-06-281-1/+1
| * Revert "Revert "Try to not use as much CPU in the StreamChangeCache"" (#3454)Amber Brown2018-06-281-2/+4
| * Revert "Try to not use as much CPU in the StreamChangeCache"Matthew Hodgson2018-06-261-4/+2
| * fixesAmber Brown2018-06-261-2/+2
| * fixesAmber Brown2018-06-261-2/+2
| * try and make loading items from the cache fasterAmber Brown2018-06-261-2/+4
| * Remove all global reactor imports & pass it around explicitly (#3424)Amber Brown2018-06-251-0/+3
| * Disable partial state group caching for wildcard lookupsRichard van der Hoff2018-06-221-13/+12
| * Merge pull request #3419 from matrix-org/rav/events_per_requestRichard van der Hoff2018-06-221-0/+15
| |\
| | * Indirect evt_count updates via method callRichard van der Hoff2018-06-221-0/+11
| | * Log number of events fetched from DBRichard van der Hoff2018-06-211-0/+4
| * | Pass around the reactor explicitly (#3385)Amber Brown2018-06-224-33/+43
| |/
| * Remove run_on_reactor (#3395)Amber Brown2018-06-141-9/+1
| * Port to sortedcontainers (with tests!) (#3332)Amber Brown2018-06-061-26/+31
| * Add hacky cache factor override systemErik Johnston2018-06-042-2/+12
* | Merge tag 'v0.31.2' into dinsicMichael Kaye2018-06-2220-242/+347
|\|
| * Consistently use six's iteritems and wrap lazy keys/values in list() if they'...Amber Brown2018-05-312-3/+5
| * Merge pull request #3281 from NotAFile/py3-six-isinstanceAmber Brown2018-05-302-11/+15
| |\
| | * pep8Adrian Tschira2018-05-291-0/+1
| | * fix recursion errorAdrian Tschira2018-05-241-7/+5
| | * remaining isintance fixesAdrian Tschira2018-05-242-6/+11
| * | fix up testsAmber Brown2018-05-281-3/+3
| * | update to more consistently use seconds in any metrics or loggingAmber Brown2018-05-283-19/+19
| * | add comment about why unregAmber Brown2018-05-281-0/+2
| * | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-282-1/+24
| |\|
| | * Merge pull request #3247 from NotAFile/py3-miscAmber Brown2018-05-241-1/+6
| | |\
| | | * fix py3 intern and remove unnecessary py3 encodeAdrian Tschira2018-05-191-1/+6
| | * | Merge pull request #3245 from NotAFile/batch-iterAmber Brown2018-05-241-0/+18
| | |\ \
| | | * | Add batch_iter to utilsAdrian Tschira2018-05-191-0/+18
| | | |/
| * | | cleanupAmber Brown2018-05-221-5/+10
| * | | cleanup pep8 errorsAmber Brown2018-05-221-2/+5
| * | | fixesAmber Brown2018-05-222-12/+30
| * | | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-221-11/+27
| |\| |
| | * | CommentErik Johnston2018-05-221-1/+1
| | * | Fix logcontext resource usage trackingErik Johnston2018-05-221-11/+27
| | |/
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-01-24 19:44:42 +0000