summary refs log tree commit diff
path: root/synapse/federation (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* make FederationClient.get_room_state_ids asyncRichard van der Hoff2020-02-031-4/+5
* make FederationClient.get_pdu asyncRichard van der Hoff2020-02-031-15/+17
* make FederationClient.backfill asyncRichard van der Hoff2020-02-031-15/+11
* Fix `room_version` in `on_invite_request` flow (#6827)Richard van der Hoff2020-02-032-7/+10
* Merge pull request #6806 from matrix-org/rav/redact_changes/3Richard van der Hoff2020-01-311-3/+1
|\
| * Pass room_version into create_local_event_from_event_dictRichard van der Hoff2020-01-301-3/+1
* | s/get_room_version/get_room_version_id/Richard van der Hoff2020-01-312-13/+13
* | pass room version into FederationHandler.on_invite_request (#6805)Richard van der Hoff2020-01-301-1/+1
|/
* Fix sending server up commands from workers (#6811)Erik Johnston2020-01-302-12/+19
* Remove unused DeviceRow class (#6800)Erik Johnston2020-01-291-20/+1
* Fix race in federation sender that delayed device updates. (#6799)Erik Johnston2020-01-291-29/+3
* Add `rooms.room_version` column (#6729)Erik Johnston2020-01-271-17/+33
* Wake up transaction queue when remote server comes back online (#6706)Erik Johnston2020-01-172-3/+34
* Add StateMap type alias (#6715)Erik Johnston2020-01-161-1/+2
* Port synapse.replication.tcp to async/await (#6666)Erik Johnston2020-01-161-1/+3
* Process EDUs in parallel with PDUs. (#6697)Erik Johnston2020-01-141-12/+58
* Merge pull request #6349 from matrix-org/babolivier/msc1802Brendan Abolivier2019-12-114-28/+140
|\
| * Merge branch 'develop' into babolivier/msc1802Brendan Abolivier2019-12-058-26/+34
| |\
| * | LintBrendan Abolivier2019-11-111-3/+2
| * | LintBrendan Abolivier2019-11-111-3/+1
| * | Fix prefix for v2/send_leaveBrendan Abolivier2019-11-111-0/+2
| * | Add server-side support to the v2 APIBrendan Abolivier2019-11-112-14/+33
| * | Implement v2 API for send_leaveBrendan Abolivier2019-11-112-5/+56
| * | Add missing yieldBrendan Abolivier2019-11-111-1/+1
| * | Implement v2 API for send_joinBrendan Abolivier2019-11-112-8/+51
* | | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-101-80/+11
* | | Refactor get_events_from_store_or_dest to return a dict (#6501)Richard van der Hoff2019-12-101-29/+15
* | | Remove fallback for missing /federation/v1/state_ids API (#6488)Richard van der Hoff2019-12-092-96/+17
| |/ |/|
* | Implementation of MSC2314 (#6176)Amber Brown2019-11-282-12/+20
* | Clean up newline quote marks around the codebase (#6362)Andrew Morgan2019-11-213-5/+5
* | Replace instance variations of homeserver with correct case/spacingAndrew Morgan2019-11-124-9/+9
|/
* Depublish a room from the public rooms list when it is upgraded (#6232)Andrew Morgan2019-11-011-1/+1
* Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-316-25/+32
|\
| * Update black to 19.10b0 (#6304)Amber Brown2019-11-011-5/+6
| * Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-315-20/+26
* | rename get_devices_by_remote to get_device_updates_by_remoteHubert Chathi2019-10-301-2/+2
* | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-305-131/+106
|\|
| * Fix small typo in comment (#6269)Andrew Morgan2019-10-301-1/+1
| * Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitErik Johnston2019-10-301-1/+3
| |\
| | * Port receipt and read markers to async/waitErik Johnston2019-10-291-1/+3
| * | Don't return coroutinesErik Johnston2019-10-291-6/+6
| |/
| * Port federation_server to async/awaitErik Johnston2019-10-291-118/+87
| * Merge tag 'v1.5.0rc2' into developRichard van der Hoff2019-10-282-5/+9
| |\
| | * Improve signature checking on some federation APIs (#6262)Richard van der Hoff2019-10-282-5/+9
| * | use %r to __repr__ objectsMichael Kaye2019-10-242-3/+3
| |/
* | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-241-1/+1
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2019-10-222-49/+0
| |\
| * | Move storage classes into a main "data store".Erik Johnston2019-10-211-1/+1
* | | implement federation parts of cross-signingHubert Chathi2019-10-221-2/+2
| |/ |/|
* | rip out some unreachable codeRichard van der Hoff2019-10-172-49/+0
|/
* Fix /federation/v1/state for recent room versions (#6170)Richard van der Hoff2019-10-081-13/+0
* add some metrics on the federation sender (#6160)Richard van der Hoff2019-10-031-5/+6
* Land improved room list based on room stats (#6019)Erik Johnston2019-10-021-0/+8
* Fix exception when resetting retry timingsRichard van der Hoff2019-09-201-1/+1
* Remove origin parameter from add_display_name_to_third_party_invite and add p...Andrew Morgan2019-09-112-3/+3
* Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_...Erik Johnston2019-09-052-3/+13
|\
| * use access methods (duh..)Jorik Schellekens2019-09-051-1/+3
| * Link the send loop with the edus contextsJorik Schellekens2019-09-052-3/+11
* | Add opentracing to all client servlets (#5983)Jorik Schellekens2019-09-051-1/+5
|/
* Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-302-15/+15
* Merge pull request #5859 from matrix-org/rei/msc2197reivilibre2019-08-282-15/+67
|\
| * Use MSC2197 on stable prefix as it has almost finished FCPOlivier Wilkinson (reivilibre)2019-08-202-26/+4
| * Add support for inbound MSC2197 requests on unstable Federation APIOlivier Wilkinson (reivilibre)2019-08-151-1/+59
| * Support MSC2197 outbound with unstable prefixOlivier Wilkinson (reivilibre)2019-08-151-15/+31
* | Propagate opentracing contexts through EDUs (#5852)Jorik Schellekens2019-08-223-80/+108
* | Opentracing across workers (#5771)Jorik Schellekens2019-08-221-15/+28
* | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-221-0/+3
* | Opentracing misc (#5856)Jorik Schellekens2019-08-161-6/+7
* | Wrap `get_local_public_room_list` call in `maybeDeferred` because itOlivier Wilkinson (reivilibre)2019-08-141-2/+8
|/
* Return 502 not 500 when failing to reach any remote server.Erik Johnston2019-08-011-4/+3
* Room Complexity Client Implementation (#5783)Amber Brown2019-07-302-7/+60
* Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatchRichard van der Hoff2019-07-261-2/+2
|\
| * Log when we receive a /make_* request from a different originRichard van der Hoff2019-07-261-2/+2
* | Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-241-1/+3
|\|
| * Fix servlet metric names (#5734)Jorik Schellekens2019-07-241-1/+3
* | Replace returnValue with return (#5736)Amber Brown2019-07-236-90/+75
|/
* Convert synapse.federation.transport.server to async (#5689)Richard van der Hoff2019-07-181-242/+188
* Add basic opentracing support (#5544)Jorik Schellekens2019-07-111-5/+21
* remove dead transaction persist code (#5622)Richard van der Hoff2019-07-052-41/+0
* Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-047-22/+32
* Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-4/+4
* Fix logging error when a tampered event is detected. (#5500)Richard van der Hoff2019-06-211-1/+0
* Run Black. (#5482)Amber Brown2019-06-2011-752/+613
* Add experimental option to reduce extremities.Erik Johnston2019-06-181-0/+3
* Clean up code for sending federation EDUs. (#5381)Richard van der Hoff2019-06-131-14/+26
* Prevent multiple device list updates from breaking a batch send (#5156)Andrew Morgan2019-06-061-2/+3
* Associate a request_name with each verify request, for loggingRichard van der Hoff2019-06-052-1/+5
* Add a test room version where we enforce key validity (#5348)Richard van der Hoff2019-06-051-15/+24
* Clean up debug logging (#5347)Richard van der Hoff2019-06-051-3/+13
* Fix failure to fetch batches of PDUs (#5342)Richard van der Hoff2019-06-041-0/+1
* Rename get_events->get_events_from_store_or_dest (#5344)Richard van der Hoff2019-06-041-20/+13
* Enforce validity period on server_keys for fed requests. (#5321)Richard van der Hoff2019-06-032-3/+5
* Implement the SHHS complexity API (#5216)Amber Brown2019-05-301-1/+30
* Fix error handling for rooms whose versions are unknown. (#5219)Richard van der Hoff2019-05-211-1/+13
* Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-151-5/+1
* Run `black` on per_destination_queueRichard van der Hoff2019-05-091-35/+39
* Limit the number of EDUs in transactions to 100 as expected by receiver (#5138)Quentin Dufour2019-05-091-26/+30
* add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-081-0/+10
* more logging improvementsRichard van der Hoff2019-04-251-8/+11
* remove extraneous exception loggingRichard van der Hoff2019-04-251-2/+2
* Clarify logging when PDU signature checking failsRichard van der Hoff2019-04-251-0/+19
* Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-014-25/+27
* Use event streams to calculate presenceErik Johnston2019-03-272-3/+89
* Make federation endpoints more tolerant of trailing slashes v2 (#4935)Andrew Morgan2019-03-262-8/+8
* Remove trailing slashes from outbound federation requests and retry on 400 (#...Andrew Morgan2019-03-211-7/+14
|\
| * Switch to wrapper function around _send_requestAndrew Morgan2019-03-131-5/+5
| * Cleaner way of implementing trailing slashesAndrew Morgan2019-03-121-5/+10
| * Merge branch 'develop' into anoa/trailing_slashes_clientAndrew Morgan2019-03-111-7/+7
| |\
| * | lintAndrew Morgan2019-03-081-1/+3
| * | Retry certain federation requests on 404Andrew Morgan2019-03-081-5/+5
| * | Remove trailing slashes from outbound federation requestsAndrew Morgan2019-03-081-7/+7
* | | Batch up outgoing read-receipts to reduce federation traffic. (#4890)Richard van der Hoff2019-03-202-21/+158
* | | Merge pull request #4855 from matrix-org/rav/refactor_transaction_queueRichard van der Hoff2019-03-155-758/+860
|\ \ \
| * | | Rename and move the classesRichard van der Hoff2019-03-135-808/+860
| * | | Factor per-destination stuff out of TransactionQueueRichard van der Hoff2019-03-131-132/+182
* | | | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_workerRichard van der Hoff2019-03-152-0/+44
|\| | |
| * | | Move client receipt processing to federation sender worker.Richard van der Hoff2019-03-132-0/+44
| | |/ | |/|
* / | Revert "Make federation endpoints more tolerant of trailing slashes for some ...Erik Johnston2019-03-142-8/+8
|/ /
* / Make federation endpoints more tolerant of trailing slashes for some endpoint...Andrew Morgan2019-03-112-8/+8
|/
* Remove unnecessary dollar signsAndrew Morgan2019-03-041-22/+22
* Avoid rebuilding Edu objects in worker mode (#4770)Richard van der Hoff2019-03-042-14/+31
* Make 'event_id' a required parameter in federated state requests (#4741)Amber Brown2019-02-271-2/+2
* When presence is enabled don't send over replicationErik Johnston2019-02-271-0/+3
* Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room...Andrew Morgan2019-02-267-243/+588
|\
| * Revert "Prevent showing non-fed rooms in fed /publicRooms"Andrew Morgan2019-02-261-2/+1
| * Merge pull request #4736 from matrix-org/anoa/public_rooms_federateAndrew Morgan2019-02-261-1/+2
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room...Erik Johnston2019-02-257-241/+561
| | |\
| | * | Don't restrict non-fed rooms over client APIsAndrew Morgan2019-02-251-1/+2
| * | | Merge pull request #4737 from matrix-org/erikj/failure_log_tbErik Johnston2019-02-251-2/+3
| |\ \ \
| | * | | Log tracebacks correctlyErik Johnston2019-02-251-2/+3
| | | |/ | | |/|
| * / | MSC 1866 - Use M_UNSUPPORTED_ROOM_VERSION for invite APIErik Johnston2019-02-232-2/+26
| |/ /
| * | Add metrics for number of outgoing EDUs, by type (#4695)Richard van der Hoff2019-02-201-4/+18
| * | Merge pull request #4420 from matrix-org/jaywink/openid-listenerErik Johnston2019-02-111-42/+95
| |\ \
| | * | Document `servlet_groups` parametersJason Robinson2019-01-231-0/+23
| | * | Split federation OpenID userinfo endpoint out of the federation resourceJason Robinson2019-01-231-42/+72
| * | | Reject large transactions on federation (#4513)Andrew Morgan2019-01-311-0/+16
| * | | No vdh tests!Erik Johnston2019-01-291-2/+1
| * | | Enable room version v3Erik Johnston2019-01-291-2/+9
| * | | Update commentErik Johnston2019-01-291-3/+3
| * | | Only check event ID domain for signatures for V1 eventsErik Johnston2019-01-293-31/+44
| * | | Use event origin for filtering incoming eventsErik Johnston2019-01-291-4/+7
| * | | Use snder and not event ID domain to check if oursErik Johnston2019-01-291-1/+1
| * | | Merge pull request #4481 from matrix-org/erikj/event_builderErik Johnston2019-01-291-14/+6
| |\ \ \
| | * | | Refactor event building into EventBuilderErik Johnston2019-01-291-14/+6
| * | | | Merge pull request #4510 from matrix-org/erikj/fixup_compute_event_signatureErik Johnston2019-01-291-1/+1
| |\ \ \ \
| | * | | | Fixup calls to `comput_event_signature`Erik Johnston2019-01-291-1/+1
| | |/ / /
| * / / / Implement fallback for V2 invite APIErik Johnston2019-01-282-14/+89
| |/ / /
| * | | Require event format version to parse or create eventsErik Johnston2019-01-254-41/+65
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813Erik Johnston2019-01-253-13/+64
| |\ \ \
| | * \ \ Merge pull request #4448 from matrix-org/erikj/get_pdu_versionsErik Johnston2019-01-243-11/+51
| | |\ \ \
| | | * | | Review commentsErik Johnston2019-01-241-1/+2
| | | * | | Add room_version param to get_pduErik Johnston2019-01-233-11/+50
| | | |/ /
| | * | | Update make_membership_event docsErik Johnston2019-01-241-2/+5
| | * | | Remove unnecessary '_sign_event'Erik Johnston2019-01-231-1/+8
| | * | | Store rejected remote invite events as outliersErik Johnston2019-01-231-2/+8
| | |/ /
| * | | Review commentsErik Johnston2019-01-241-1/+2
| * | | Implement MSC 1813 - Add room version to make APIsErik Johnston2019-01-232-6/+23
| |/ /
| * | Add /v2/invite federation APIErik Johnston2019-01-152-6/+40
| * | Add groundwork for new versions of federation APIsErik Johnston2019-01-152-67/+71
| * | Don't log stack traces for HTTP error responsesErik Johnston2019-01-081-1/+6
| * | Refactor request sending to have better excpetions (#4358)Erik Johnston2019-01-081-5/+14
| * | Update synapse/federation/federation_server.pyRichard van der Hoff2018-11-091-1/+1
| * | Update synapse/federation/federation_server.pyRichard van der Hoff2018-11-091-1/+1
| * | Drop PDUs of unknown roomsErik Johnston2018-11-081-1/+23
| * | Add helpers for getting prev and auth events (#4139)Erik Johnston2018-11-061-3/+1
| * | Clean up event accesses and testsErik Johnston2018-11-021-3/+0
| * | Remove the unused /pull federation API (#4118)Amber Brown2018-10-312-14/+0
| |/
* / Prevent showing non-fed rooms in fed /publicRoomsAndrew Morgan2019-02-261-1/+2
|/
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa...Erik Johnston2018-10-251-1/+1
|\
| * Fix a number of flake8 errorsRichard van der Hoff2018-10-241-1/+1
* | Add config option to control alias creationErik Johnston2018-10-191-14/+2
|/
* Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-162-6/+4
* Various cleanups in the federation client code (#4031)Richard van der Hoff2018-10-162-23/+23
* Merge pull request #3964 from matrix-org/rav/remove_localhost_checksRichard van der Hoff2018-09-281-30/+6
|\
| * Fix complete fail to do the right thingRichard van der Hoff2018-09-281-1/+2
| * remove spurious federation checks on localhostRichard van der Hoff2018-09-261-31/+6
* | more commentsRichard van der Hoff2018-09-271-2/+0
* | Include eventid in log lines when processing incoming federation transactions...Richard van der Hoff2018-09-271-15/+17
* | fix docstring for FederationClient.get_state_for_roomRichard van der Hoff2018-09-261-4/+4
|/
* Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pduAmber Brown2018-09-261-1/+1
|\
| * Comments and interface cleanup for on_receive_pduRichard van der Hoff2018-09-201-1/+1
* | Fix some instances of ExpiringCache not expiring cache itemsErik Johnston2018-09-211-16/+12
|/
* Fix handling of redacted events from federationErik Johnston2018-09-131-1/+1
* Port federation/ to py3 (#3847)Amber Brown2018-09-123-19/+18
* Merge pull request #3826 from matrix-org/rav/logging_for_keyringAmber Brown2018-09-121-7/+27
|\
| * clearer logging when things fail, tooRichard van der Hoff2018-09-061-7/+27
* | Limit the number of PDUs/EDUs per fedreation transactionErik Johnston2018-09-061-0/+12
|/
* Merge branch 'master' into developRichard van der Hoff2018-09-064-31/+125
|\
| * Fix origin handling for pushed transactionsRichard van der Hoff2018-09-053-15/+15
| * Check that signatures on events are validRichard van der Hoff2018-09-051-16/+110
* | Port http/ to Python 3 (#3771)Amber Brown2018-09-061-5/+5
* | fix #3445Krombel2018-08-291-2/+2
* | Merge pull request #3735 from matrix-org/travis/federation-spellingRichard van der Hoff2018-08-221-1/+1
|\ \
| * | limt -> limitTravis Ralston2018-07-311-1/+1
* | | Log more detail when we fail to authenticate requestErik Johnston2018-08-211-3/+3
* | | Don't log exceptions when failing to fetch server keysErik Johnston2018-08-211-2/+2
| |/ |/|
* | Integrate presence from hotfixes (#3694)Amber Brown2018-08-181-0/+4
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-151-4/+4
|\ \
| * | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-101-4/+4
* | | Fixup doc commentsErik Johnston2018-08-091-0/+11
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-095-13/+132
|\| |
| * | Merge pull request #3664 from matrix-org/rav/federation_metricsRichard van der Hoff2018-08-081-1/+9
| |\ \
| | * | more metrics for the federation and appservice sendersRichard van der Hoff2018-08-071-1/+9
| * | | Check m.room.create for sane room_versionsRichard van der Hoff2018-08-061-3/+23
| * | | include known room versions in outgoing make_joinsRichard van der Hoff2018-08-062-4/+9
| * | | sanity check response from make_joinRichard van der Hoff2018-08-031-1/+3
| * | | Enforce compatibility when processing make_join requestsRichard van der Hoff2018-08-032-4/+41
| * | | Docstrings for BaseFederationServletRichard van der Hoff2018-08-031-0/+47
| |/ /
* / / Add EDU/query handling over replicationErik Johnston2018-08-061-0/+43
|/ /
* | Merge pull request #3639 from matrix-org/rav/refactor_error_handlingRichard van der Hoff2018-08-021-12/+17
|\ \
| * | Refactor code for turning HttpResponseException into SynapseErrorRichard van der Hoff2018-08-011-2/+2
| * | Be more careful which errors we send back over the C-S APIRichard van der Hoff2018-08-011-12/+17
* | | Merge pull request #3638 from matrix-org/rav/refactor_federation_client_excep...Richard van der Hoff2018-08-021-129/+148
|\| |
| * | Factor out exception handling in federation_clientRichard van der Hoff2018-08-011-129/+148
* | | Merge branch 'master' into developRichard van der Hoff2018-08-021-0/+1
|\ \ \ | |/ / |/| |
| * | Validation for events/rooms in fed requestsRichard van der Hoff2018-08-021-0/+1
* | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-021-1/+1
| |/ |/|
* | Remove pdu_failures from transactionsTravis Ralston2018-07-305-96/+7
* | Update the send_leave path to be an event_idTravis Ralston2018-07-261-2/+2
* | Improve logging for exceptions handling PDUsRichard van der Hoff2018-07-231-3/+8
* | Run things as background processesRichard van der Hoff2018-07-181-9/+6
* | Resource tracking for background processesRichard van der Hoff2018-07-181-5/+7
|/
* rename assert_params_in_request to assert_params_in_dictKrombel2018-07-131-2/+2
* run isortAmber Brown2018-07-099-64/+57
* Implementation of server_aclsRichard van der Hoff2018-07-042-4/+154
* More server_name validationRichard van der Hoff2018-07-041-2/+3
* Reject invalid server names (#3480)Richard van der Hoff2018-07-031-22/+44
* Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checkingErik Johnston2018-06-291-1/+3
|\
| * handle federation not telling us about prev_eventsAmber Brown2018-06-271-1/+3
* | Attempt to be more performant on PyPy (#3462)Amber Brown2018-06-281-1/+1
|/
* Merge pull request #3428 from matrix-org/erikj/persisted_pduErik Johnston2018-06-221-12/+1
|\
| * simplify get_persisted_pduRichard van der Hoff2018-06-121-12/+1
* | Populate synapse_federation_client_sent_pdu_destinations:count again (#3386)Amber Brown2018-06-211-3/+7
* | Remove run_on_reactor (#3395)Amber Brown2018-06-141-4/+0
|/
* federation/send_queue.py: fix usage of sortedcontainers.SortedDictIvan Shapovalov2018-06-061-27/+22
* Port to sortedcontainers (with tests!) (#3332)Amber Brown2018-06-061-7/+7
* federation/send_queue.py: fix usage of LaterGaugeIvan Shapovalov2018-06-031-1/+1
* Consistently use six's iteritems and wrap lazy keys/values in list() if they'...Amber Brown2018-05-313-5/+7
* fixesAmber Brown2018-05-231-4/+4
* cleanupAmber Brown2018-05-221-3/+2
* cleanup pep8 errorsAmber Brown2018-05-222-6/+21
* fixesAmber Brown2018-05-221-3/+3
* replacing portionsAmber Brown2018-05-214-53/+35
* Merge pull request #3209 from damir-manapov/masterRichard van der Hoff2018-05-111-2/+0
|\
| * transaction_id, destination twiceDamir Manapov2018-05-101-2/+0
* | Merge branch 'release-v0.28.1' into developRichard van der Hoff2018-05-011-3/+18
|\|
| * Apply some limits to depth to counter abuseRichard van der Hoff2018-05-011-3/+18
* | Merge branch 'develop' into py3-xrange-1Richard van der Hoff2018-04-301-2/+3
|\ \
| * \ Merge remote-tracking branch 'origin/develop' into rav/use_run_in_backgroundRichard van der Hoff2018-04-272-3/+12
| |\ \
| * | | Use run_in_background in preference to preserve_fnRichard van der Hoff2018-04-271-2/+3
| | |/ | |/|
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-27 06:05:37 +0000