summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupAndrew Morgan2020-02-205-27/+137
|\| | | |
| * | | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupErik Johnston2019-08-145-27/+137
| |\ \ \ \ | | |/ / / | |/| | | Retry well-known lookup before expiry.
| | * | | NewsfileErik Johnston2019-08-131-0/+1
| | | | |
| | * | | Retry well-known lookup before expiry.Erik Johnston2019-08-134-27/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives a bit of a grace period where we can attempt to refetch a remote `well-known`, while still using the cached result if that fails. Hopefully this will make the well-known resolution a bit more torelant of failures, rather than it immediately treating failures as "no result" and caching that for an hour.
* | | | | 1.3.0rc1Andrew Morgan2020-02-2063-62/+75
|\| | | |
| * | | | 1.3.0rc1 v1.3.0rc1Brendan Abolivier2019-08-1363-62/+75
| | | | |
* | | | | Merge pull request #5848 from matrix-org/hawkowl/fix-mediarepo-worker-startupAndrew Morgan2020-02-202-1/+2
|\| | | |
| * | | | Merge pull request #5848 from matrix-org/hawkowl/fix-mediarepo-worker-startupBrendan Abolivier2019-08-132-1/+2
| |\ \ \ \ | | | | | | | | | | | | Fix mediarepo worker startup
| | * | | | changelogAmber H. Brown2019-08-141-0/+1
| | | | | |
| | * | | | fix config being a dict, actuallyAmber H. Brown2019-08-141-1/+1
| |/ / / /
* | | | | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stopAndrew Morgan2020-02-204-21/+55
|\| | | |
| * | | | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stopErik Johnston2019-08-134-21/+55
| |\ \ \ \ | | |/ / / | |/| | | Handle pusher being deleted during processing.
| | * | | Remove redundant returnErik Johnston2019-08-131-1/+0
| | | | |
| | * | | Clarify docstringErik Johnston2019-08-131-1/+1
| | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| | * | | NewsfileErik Johnston2019-08-011-0/+1
| | | | |
| | * | | Handle pusher being deleted during processing.Erik Johnston2019-08-013-21/+55
| | | | | | | | | | | | | | | | | | | | | | | | | Instead of throwing a StoreError lets break out of processing loop and mark the pusher as stopped.
* | | | | Don't load the media repo when configured to use an external media repo (#5754)Andrew Morgan2020-02-2010-91/+188
|\| | | |
| * | | | Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-1310-91/+188
| | | | |
* | | | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownAndrew Morgan2020-02-204-171/+222
|\| | | |
| * | | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownErik Johnston2019-08-134-171/+222
| |\ \ \ \ | | | | | | | | | | | | Add a lower bound to well-known TTL.
| | * | | | Make default well known cache global again.Erik Johnston2019-08-131-1/+4
| | | | | |
| | * | | | NewsfileErik Johnston2019-08-121-0/+1
| | | | | |
| | * | | | Move well known lookup into a separate clasErik Johnston2019-08-073-173/+216
| | | | | |
| | * | | | Add a lower bound for TTL on well known results.Erik Johnston2019-08-062-2/+6
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | It costs both us and the remote server for us to fetch the well known for every single request we send, so we add a minimum cache period. This is set to 5m so that we still honour the basic premise of "refetch frequently".
* | | | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pausesAndrew Morgan2020-02-202-128/+143
|\| | | |
| * | | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pausesErik Johnston2019-08-132-128/+143
| |\ \ \ \ | | | | | | | | | | | | Don't unnecessarily block notifying of new events.
| | * | | | NewsfileErik Johnston2019-08-061-0/+1
| | | | | |
| | * | | | Don't unnecessarily block notifying of new events.Erik Johnston2019-08-061-128/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When persisting events we calculate new stream orderings up front. Before we notify about an event all events with lower stream orderings must have finished being persisted. This PR moves the assignment of stream ordering till *after* calculated the new current state and split the batch of events into separate chunks for persistence. This means that if it takes a long time to calculate new current state then it will not block events in other rooms being notified about. This should help reduce some global pauses in the events stream which can last for tens of seconds (if not longer), caused by some particularly expensive state resolutions.
* | | | | | Cross-signing [1/4] -- hidden devices (#5759)Andrew Morgan2020-02-204-10/+49
|\ \ \ \ \ \
| * | | | | | Cross-signing [1/4] -- hidden devices (#5759)Hubert Chathi2019-08-124-10/+49
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * allow devices to be marked as "hidden" This is a prerequisite for cross-signing, as it allows us to create other things that live within the device namespace, so they can be used for signatures.
* | | | | | Merge pull request #5843 from matrix-org/erikj/workers_hist_visAndrew Morgan2020-02-202-4/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #5843 from matrix-org/erikj/workers_hist_visErik Johnston2019-08-122-4/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Whitelist history visbility sytests for worker mode
| | * | | | | NewsfileErik Johnston2019-08-121-0/+1
| | | | | | |
| | * | | | | Whitelist history visbility sytests for worker modeErik Johnston2019-08-121-4/+0
| | | | | | |
* | | | | | | Merge pull request #5839 from tcitworld/fix-purge-remote-media-scriptAndrew Morgan2020-02-202-1/+2
|\| | | | | |
| * | | | | | Merge pull request #5839 from tcitworld/fix-purge-remote-media-scriptErik Johnston2019-08-122-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Fix curl command typo in purge_remote_media.sh
| | * | | | | Changelogs should end in '.' or '!'Erik Johnston2019-08-121-1/+1
| | | | | | |
| | * | | | | Fix curl command typo in purge_remote_media.shThomas Citharel2019-08-092-1/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was verbose option instead of -X, command didn't work Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | | | Merge pull request #5788 from matrix-org/rav/metaredactionsAndrew Morgan2020-02-203-101/+183
|\| | | | |
| * | | | | Merge pull request #5788 from matrix-org/rav/metaredactionsRichard van der Hoff2019-08-123-101/+183
| |\ \ \ \ \ | | |/ / / / | |/| | | | Fix handling of redactions of redactions
| | * | | | changelogRichard van der Hoff2019-07-301-0/+1
| | | | | |
| | * | | | Handle loops in redaction eventsRichard van der Hoff2019-07-302-60/+106
| | | | | |
| | * | | | recursively fetch redactionsRichard van der Hoff2019-07-301-32/+36
| | | | | |
| | * | | | split _get_events_from_db out of _enqueue_eventsRichard van der Hoff2019-07-291-32/+51
| | | | | |
| | * | | | Return dicts from _fetch_event_listRichard van der Hoff2019-07-291-15/+27
| | | | | |
* | | | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_syncAndrew Morgan2020-02-202-6/+38
|\| | | | |
| * | | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_syncErik Johnston2019-08-062-6/+38
| |\ \ \ \ \ | | | | | | | | | | | | | | Handle TimelineBatch being limited and empty.
| | * | | | | NewsfileErik Johnston2019-08-061-0/+1
| | | | | | |
| | * | | | | Handle TimelineBatch being limited and empty.Erik Johnston2019-08-061-6/+37
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This hopefully addresses #5407 by gracefully handling an empty but limited TimelineBatch. We also add some logging to figure out how this is happening.
* | | | | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2020-02-202-3/+12
|\| | | | |
| * | | | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2019-08-062-3/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | Part of fixing matrix-org/sytest#652 Sytest PR: matrix-org/sytest#667
* | | | | Account validity: allow defining HTML templates to serve the us… (#5807)Andrew Morgan2020-02-201-3/+3
|\| | | |
| * | | | Account validity: allow defining HTML templates to serve the us… (#5807)Brendan Abolivier2019-08-018-11/+119
| |\ \ \ \ | | | | | | | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt
| | * | | | LintBrendan Abolivier2019-08-013-17/+10
| | | | | |
| | * | | | Sample configBrendan Abolivier2019-08-011-0/+10
| | | | | |
| | * | | | ChangelogBrendan Abolivier2019-08-011-0/+1
| | | | | |
| | * | | | Add testsBrendan Abolivier2019-08-011-0/+37
| | | | | |
| | * | | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-015-9/+76
| | | | | |
* | | | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachableAndrew Morgan2020-02-202-4/+4
|\| | | | |
| * | | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachableErik Johnston2019-08-012-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | Return 502 not 500 when failing to reach any remote server.
| | * | | | | NewsfileErik Johnston2019-08-011-0/+1
| | | | | | |
| | * | | | | Return 502 not 500 when failing to reach any remote server.Erik Johnston2019-08-011-4/+3
| | | | | | |
* | | | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806)Andrew Morgan2020-02-202-21/+22
|\| | | | | |
| * | | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806)Andrew Morgan2019-08-012-21/+22
| | | | | | | | | | | | | | | | | | | | | Fixes #5803
* | | | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_errorAndrew Morgan2020-02-202-1/+7
|\| | | | | |
| * | | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_errorErik Johnston2019-08-012-1/+7
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Handle incorrectly encoded query params correctly
| | * | | | | NewsfileErik Johnston2019-08-011-0/+1
| | | | | | |
| | * | | | | Handle incorrectly encoded query params correctlyErik Johnston2019-08-011-1/+6
| | | |_|/ / | | |/| | |
* | | | | | Merge pull request #5805 from matrix-org/erikj/validate_stateAndrew Morgan2020-02-202-2/+10
|\| | | | |
| * | | | | Merge pull request #5805 from matrix-org/erikj/validate_stateErik Johnston2019-08-012-2/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | Validate well known state events are state events.
| | * | | | | NewsfileErik Johnston2019-07-311-0/+1
| | | | | | |
| | * | | | | Validate well-known state events are state events.Erik Johnston2019-07-311-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lets disallow sending things like memberships, topics etc as non-state events.
* | | | | | | Merge pull request #5801 from matrix-org/erikj/recursive_tombstoneAndrew Morgan2020-02-202-0/+10
|\| | | | | |
| * | | | | | Merge pull request #5801 from matrix-org/erikj/recursive_tombstoneErik Johnston2019-08-012-0/+10
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Don't allow clients to send tombstones that reference the same room
| | * | | | | Fix spelling.Erik Johnston2019-08-012-2/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| | * | | | NewsfileErik Johnston2019-07-311-0/+1
| | | | | |
| | * | | | Don't allow clients to send tombstones that reference the same roomErik Johnston2019-07-311-0/+7
| | | | | |
* | | | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_roomAndrew Morgan2020-02-202-1/+4
|\| | | | |
| * | | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_roomErik Johnston2019-08-012-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | Deny redaction of events in a different room.
| | * | | | | NewsfileErik Johnston2019-07-311-0/+1
| | | | | | |
| | * | | | | Deny redaction of events in a different room.Erik Johnston2019-07-311-1/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | We already correctly filter out such redactions, but we should also deny them over the CS API.
* | | | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errorsAndrew Morgan2020-02-203-32/+61
|\| | | | |
| * | | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errorsErik Johnston2019-08-013-32/+61
| |\ \ \ \ \ | | | | | | | | | | | | | | Handle RequestSendFailed exception correctly in more places.
| | * | | | | NewsfileErik Johnston2019-07-301-0/+1
| | | | | | |
| | * | | | | Don't log as exception when failing durig backfillErik Johnston2019-07-301-0/+3
| | | | | | |
| | * | | | | Correctly handle errors doing requests to group serversErik Johnston2019-07-291-32/+57
| | | | | | |
* | | | | | | Merge pull request #5804 from matrix-org/erikj/match_against_state_keyAndrew Morgan2020-02-202-1/+8
|\| | | | | |
| * | | | | | Merge pull request #5804 from matrix-org/erikj/match_against_state_keyErik Johnston2019-08-012-1/+8
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Explicitly check that tombstone is a state event before notifying.
| | * | | | | NewsfileErik Johnston2019-07-311-0/+1
| | | | | | |
| | * | | | | Explicitly check that tombstone is a state event before notifying.Erik Johnston2019-07-311-1/+7
| |/ / / / /
* | | | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)Andrew Morgan2020-02-203-2/+3
|\| | | | |
| * | | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)Andrew Morgan2019-07-312-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is intended as an amendment to #5674 as using M_UNKNOWN as the errcode makes it hard for clients to differentiate between an invalid password and a deactivated user (the problem we were trying to solve in the first place). M_UNKNOWN was originally chosen as it was presumed than an MSC would have to be carried out to add a new code, but as Synapse often is the testing bed for new MSC implementations, it makes sense to try it out first in the wild and then add it into the spec if it is successful. Thus this PR return a new M_USER_DEACTIVATED code when a deactivated user attempts to login.
| * | | | | Remove duplicate return statementAndrew Morgan2019-07-311-1/+0
| | | | | |
* | | | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_knownAndrew Morgan2020-02-204-17/+20
|\| | | | |
| * | | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_knownErik Johnston2019-07-314-17/+20
| |\ \ \ \ \ | | | | | | | | | | | | | | Share SSL options for well-known requests
| | * | | | | NewsfileErik Johnston2019-07-311-0/+1
| | | | | | |
| | * | | | | Share SSL options for well-known requestsErik Johnston2019-07-313-17/+19
| | | | | | |
* | | | | | | Remove DelayedCall debugging from test runs (#5787)Andrew Morgan2020-02-202-6/+1
|\| | | | | |
| * | | | | | Remove DelayedCall debugging from test runs (#5787)Amber Brown2019-07-312-6/+1
| | | | | | |
* | | | | | | Merge pull request #5796 from matrix-org/erikj/disable_codecov_reportAndrew Morgan2020-02-202-2/+2
|\| | | | | |
| * | | | | | Merge pull request #5796 from matrix-org/erikj/disable_codecov_reportErik Johnston2019-07-312-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Disable codecov reports to GH comments.
| | * | | | | NewsfileErik Johnston2019-07-311-0/+1
| | | | | | |
| | * | | | | Disable codecov reports to GH comments.Erik Johnston2019-07-311-2/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The double posting is really annoying, and I don't think anyone is actually reading them. The commit statuses should give a good summary and will link to a full report.
* | | | | | Merge pull request #5793 from matrix-org/erikj/fix_bg_updateAndrew Morgan2020-02-203-1/+23
|\| | | | |
| * | | | | Merge pull request #5793 from matrix-org/erikj/fix_bg_updateBrendan Abolivier2019-07-303-1/+23
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Don't recreate current_state_events.membership column
| | * | | | NewsfileErik Johnston2019-07-301-0/+1
| | | | | |
| | * | | | Don't recreate columnErik Johnston2019-07-302-1/+22
| | | | | |
* | | | | | Merge pull request #5792 from matrix-org/erikj/fix_bg_updateAndrew Morgan2020-02-203-1/+2
|\| | | | |
| * | | | | Merge pull request #5792 from matrix-org/erikj/fix_bg_updateErik Johnston2019-07-303-1/+2
| |\| | | | | | | | | | | | | | | | Fix current_state_events membership background update.
| | * | | | NewsfileErik Johnston2019-07-301-0/+1
| | | | | |
| | * | | | Fix current_state_events membership background update.Erik Johnston2019-07-302-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Turns out not all rooms are in `rooms`, so lets fetch the room list from `current_state_events`. We move the delta file to force it to be run again.
* | | | | Merge pull request #5789 from matrix-org/erikj/fix_error_handling_keysAndrew Morgan2020-02-202-4/+4
|\| | | |
| * | | | Merge pull request #5789 from matrix-org/erikj/fix_error_handling_keysErik Johnston2019-07-302-4/+4
| |\ \ \ \ | | | | | | | | | | | | Fix error handling when fetching remote device keys
| | * | | | NewsfileErik Johnston2019-07-301-0/+1
| | | | | |
| | * | | | Unwrap errorErik Johnston2019-07-301-1/+2
| | | | | |
| | * | | | Fix error handling when fetching remote device keysErik Johnston2019-07-301-3/+1
| |/ / / /
* | | | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_stateAndrew Morgan2020-02-202-1/+37
|\| | | |
| * | | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_stateErik Johnston2019-07-302-1/+37
| |\ \ \ \ | | | | | | | | | | | | Add unit test for current state membership bg update
| | * | | | NewsfileErik Johnston2019-07-231-0/+1
| | | | | |
| | * | | | Add unit test for current state membership bg updateErik Johnston2019-07-231-1/+36
| | | | | |
* | | | | | Remove non-functional 'expire_access_token' setting (#5782)Andrew Morgan2020-02-208-37/+9
|\| | | | |
| * | | | | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-308-37/+9
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `expire_access_token` didn't do what it sounded like it should do. What it actually did was make Synapse enforce the 'time' caveat on macaroons used as access tokens, but since our access token macaroons never contained such a caveat, it was always a no-op. (The code to add 'time' caveats was removed back in v0.18.5, in #1656)
* | | | | Room Complexity Client Implementation (#5783)Andrew Morgan2020-02-208-14/+298
|\| | | |
| * | | | Room Complexity Client Implementation (#5783)Amber Brown2019-07-308-14/+298
| | |/ / | |/| |
* | | | Merge pull request #5774 from matrix-org/erikj/fix_rejected_membershipAndrew Morgan2020-02-202-0/+7
|\| | |
| * | | Merge pull request #5774 from matrix-org/erikj/fix_rejected_membershipErik Johnston2019-07-292-0/+7
| |\ \ \ | | | | | | | | | | Fix room summary when rejected events are in state
| | * | | NewsfileErik Johnston2019-07-261-0/+1
| | | | |
| | * | | Fix room summary when rejected events are in stateErik Johnston2019-07-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Annoyingly, `current_state_events` table can include rejected events, in which case the membership column will be null. To work around this lets just always filter out null membership for now.
* | | | | Merge pull request #5752 from matrix-org/erikj/forgotten_userAndrew Morgan2020-02-203-35/+124
|\| | | |
| * | | | Merge pull request #5752 from matrix-org/erikj/forgotten_userErik Johnston2019-07-293-35/+124
| |\ \ \ \ | | | | | | | | | | | | Remove some more joins on room_memberships
| | * | | | Expand commentErik Johnston2019-07-291-0/+5
| | | | | |
| | * | | | Remove lost commentErik Johnston2019-07-291-7/+0
| | |/ / /
| | * | | NewsfileErik Johnston2019-07-241-0/+1
| | | | |
| | * | | Remove join when calculating room summaries.Erik Johnston2019-07-241-13/+21
| | | | |
| | * | | Remove join on room_memberships when fetching rooms for user.Erik Johnston2019-07-241-22/+36
| | | | |
| | * | | Add function to get all forgotten rooms for userErik Johnston2019-07-242-0/+68
| | |/ / | | | | | | | | | | | | | | | | | | | | This will allow us to efficiently filter out rooms that have been forgotten in other queries without having to join against the `room_memberships` table.
* | | | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqliteAndrew Morgan2020-02-206-6/+9
|\| | |
| * | | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqliteErik Johnston2019-07-293-4/+6
| |\ \ \ | | | | | | | | | | Fix current_state bg update to work on old SQLite
| | * | | NewsfileErik Johnston2019-07-291-0/+1
| | | | |
| | * | | Update old deps unit test to use old sqlite3Erik Johnston2019-07-291-2/+3
| | | | |
| | * | | Fix current_state bg update to work on old SQLiteErik Johnston2019-07-291-2/+2
| | | | |
| * | | | Move some timeout checking logs to DEBUG #5785 Amber Brown2019-07-303-2/+3
| | | | |
* | | | | Update the device list cache when keys/query is called (#5693)Andrew Morgan2020-02-203-82/+137
|\| | | |
| * | | | Update the device list cache when keys/query is called (#5693)Jorik Schellekens2019-07-293-74/+137
| | | | |
* | | | | Fix debian packages for sid being called buster. (#5775)Andrew Morgan2020-02-203-1/+8
|\| | | |
| * | | | Fix debian packages for sid being called buster. (#5775)Erik Johnston2019-07-303-1/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix debian packages for sid being called buster. I don't know why the sid images return buster as its codename in `lsb_release` but it does, so lets just grab the codename from the distro we pass into dockerfile * Newsfile
* | | | Merge pull request #5780 from matrix-org/baboliver/loopingcall-argsAndrew Morgan2020-02-200-0/+0
|\| | |
| * | | Merge pull request #5780 from matrix-org/baboliver/loopingcall-argsBrendan Abolivier2019-07-292-2/+5
| |\ \ \ | | | | | | | | | | Add ability to pass arguments to looping calls
| | * | | ChangelogBrendan Abolivier2019-07-291-0/+1
| | | | |
| | * | | 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 developAndrew Morgan2020-02-190-0/+0
|\| | |
| * | | Merge branch 'master' into developRichard van der Hoff2019-07-266-4/+38
| |\ \ \ | | | |/ | | |/|
| * | | Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatchRichard van der Hoff2019-07-263-4/+38
| |\ \ \ | | | | | | | | | | Log when we receive a /make_* request from a different origin
* | \ \ \ yet more changelog attribution fixesAndrew Morgan2020-02-191-3/+7
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | yet more changelog attribution fixes v1.2.1Richard van der Hoff2019-07-261-2/+2
| | | | |
| * | | | correct attributions in changelog github/release-v1.2.1 release-v1.2.1Richard van der Hoff2019-07-261-1/+4
| | | | |
| * | | | correct attributions in changelogRichard van der Hoff2019-07-261-1/+2
| | | | |
* | | | | 1.2.1Andrew Morgan2020-02-195-4/+30
|\| | | |
| * | | | 1.2.1Richard van der Hoff2019-07-265-4/+30
| | | | |
* | | | | Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1Andrew Morgan2020-02-194-4/+42
|\| | | |
| * | | | Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1Richard van der Hoff2019-07-263-4/+38
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Log when we receive a /make_* request from a different originRichard van der Hoff2019-07-263-4/+38
| | | | |
| * | | | Log when we receive receipt from a different originErik Johnston2019-07-261-13/+22
| | | | |
| * | | | Fix DoS when there is a cycle in redaction eventsRichard van der Hoff2019-07-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Make sure that synapse doesn't explode when a redaction redacts itself, or there is a larger cycle.
| * | | | Merge branch 'rav/redactions/cross_room_id' into release-v1.2.1Richard van der Hoff2019-07-252-0/+28
| |\ \ \ \
* | \ \ \ \ Convert RedactionTestCase to modern test style (#5768)Andrew Morgan2020-02-192-36/+39
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Convert RedactionTestCase to modern test style (#5768)Richard van der Hoff2019-07-262-36/+39
| | | | | |
* | | | | | Merge pull request #5767 from matrix-org/rav/redactions/cross_room_idAndrew Morgan2020-02-192-0/+28
|\| | | | |
| * | | | | Merge pull request #5767 from matrix-org/rav/redactions/cross_room_idRichard van der Hoff2019-07-252-0/+28
| |\ \ \ \ \ | | | |/ / / | | |/| | | log when a redaction attempts to redact an event in a different room
| | * | | | log when a redaction attempts to redact an event in a different roomRichard van der Hoff2019-07-252-0/+28
| | |/ / /
* | | | | Fix some error cases in the caching layer. (#5749)Andrew Morgan2020-02-193-35/+130
|\| | | |
| * | | | Fix some error cases in the caching layer. (#5749)Richard van der Hoff2019-07-253-35/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was some inconsistent behaviour in the caching layer around how exceptions were handled - particularly synchronously-thrown ones. This seems to be most easily handled by pushing the creation of ObservableDeferreds down from CacheDescriptor to the Cache.
* | | | | Merge branch 'master' into developAndrew Morgan2020-02-190-0/+0
|\| | | |
| * | | | Merge branch 'master' into developAndrew Morgan2019-07-253-3/+12
| |\| | |
* | | | | 1.2.0Andrew Morgan2020-02-193-3/+12
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 1.2.0 v1.2.0 github/release-v1.2.0 release-v1.2.0Andrew Morgan2019-07-253-3/+12
| | |/ / | |/| |
* | | | Merge tag 'v1.2.0rc2' into developAndrew Morgan2020-02-190-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-2411-32/+101
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Bugfixes -------- - Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734))
* | | | 1.2.0rc2Andrew Morgan2020-02-193-2/+10
|\ \ \ \ | | |/ / | |/| |
| * | | 1.2.0rc2 v1.2.0rc2Andrew Morgan2019-07-243-2/+10
| | | |
* | | | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatchAndrew Morgan2020-02-192-13/+23
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatchErik Johnston2019-07-242-13/+23
| |\ \ \ | | | | | | | | | | Log when we receive receipt from a different origin
| | * | | Update changelog.d/5743.bugfixErik Johnston2019-07-231-1/+1
| | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| | * | | NewsfileErik Johnston2019-07-231-0/+1
| | | | |
| | * | | Log when we receive receipt from a different originErik Johnston2019-07-231-13/+22
| | | | |
* | | | | Stop trying to fetch events with event_id=None. (#5753)Andrew Morgan2020-02-194-11/+23
|\| | | |
| * | | | Stop trying to fetch events with event_id=None. (#5753)Richard van der Hoff2019-07-244-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `None` is not a valid event id, so queuing up a database fetch for it seems like a silly thing to do. I considered making `get_event` return `None` if `event_id is None`, but then its interaction with `allow_none` seemed uninituitive, and strong typing ftw.
* | | | | Fix servlet metric names (#5734)Andrew Morgan2020-02-1910-31/+92
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix servlet metric names (#5734)Jorik Schellekens2019-07-2410-31/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix servlet metric names Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Remove redundant check * Cover all return paths
* | | | | Add a prometheus metric for active cache lookups. (#5750)Andrew Morgan2020-02-193-2/+34
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Add a prometheus metric for active cache lookups. (#5750)Richard van der Hoff2019-07-243-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a prometheus metric for active cache lookups. * changelog
* | | | | Make Jaeger fully configurable (#5694)Andrew Morgan2020-02-194-4/+46
|\| | | |
| * | | | Make Jaeger fully configurable (#5694)Jorik Schellekens2019-07-234-4/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow Jaeger to be configured * Update sample config
* | | | | Replace returnValue with return (#5736)Andrew Morgan2020-02-19177-1509/+1355
|\| | | |
| * | | | Replace returnValue with return (#5736)Amber Brown2019-07-23177-1514/+1360
| | |_|/ | |/| |
* | | | Opentracing Utils (#5722)Andrew Morgan2020-02-193-101/+357
|\| | |
| * | | Opentracing Utils (#5722)Jorik Schellekens2019-07-233-101/+357
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add decerators for tracing functions * Use the new clean contexts * Context and edu utils * Move opentracing setters * Move whitelisting * Sectioning comments * Better args wrapper * Docstrings Co-Authored-By: Erik Johnston <erik@matrix.org> * Remove unused methods. * Don't use global * One tracing decorator to rule them all.
* | | | Merge pull request #5732 from matrix-org/erikj/sdnotifyAndrew Morgan2020-02-1917-14/+67
|\| | |
| * | | Merge pull request #5732 from matrix-org/erikj/sdnotifyErik Johnston2019-07-2317-14/+67
| |\ \ \ | | |_|/ | |/| | Add process hooks to tell systemd our state.
| | * | Also update systemd-with-workers contrib examplesErik Johnston2019-07-232-2/+4
| | | |
| | * | Update example systemd service fileErik Johnston2019-07-221-1/+3
| | | |
| | * | Call startup commands as system triggers.Erik Johnston2019-07-2211-11/+29
| | | | | | | | | | | | | | | | | | | | This helps ensures that we only consider ourselves "up" once all the startup functions have completed.
| | * | NewsfileErik Johnston2019-07-221-0/+1
| | | |
| | * | Add process hooks to tell systemd our state.Erik Johnston2019-07-222-0/+30
| | | | | | | | | | | | | | | | Fixes #5676.
* | | | Merge pull request #5740 from matrix-org/erikj/worker_flakey_testsAndrew Morgan2020-02-192-1/+8
|\| | |
| * | | Merge pull request #5740 from matrix-org/erikj/worker_flakey_testsErik Johnston2019-07-232-1/+8
| |\ \ \ | | | | | | | | | | Mark flakey tests as blacklisted for worker mode
| | * | | NewsfileErik Johnston2019-07-231-0/+1
| | | | |
| | * | | Mark flakey tests as blacklisted for worker modeErik Johnston2019-07-231-1/+7
| |/ / /
* | | | Merge pull request #5738 from matrix-org/erikj/faster_updateAndrew Morgan2020-02-192-18/+31
|\| | |
| * | | Merge pull request #5738 from matrix-org/erikj/faster_updateErik Johnston2019-07-232-18/+31
| |\ \ \ | | | | | | | | | | Speed up current state background update.
| | * | | NewsfileErik Johnston2019-07-231-0/+1
| | | | |
| | * | | Speed up current state background update.Erik Johnston2019-07-231-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | | Turns out that storing huge JSON arrays in the progress JSON isn't something that postgres particularly likes.
* | | | | Merge pull request #5733 from matrix-org/erikj/exlude_sytest_blacklistAndrew Morgan2020-02-192-1/+2
|\| | | |
| * | | | Merge pull request #5733 from matrix-org/erikj/exlude_sytest_blacklistErik Johnston2019-07-232-1/+2
| |\ \ \ \ | | |/ / / | |/| | | Don't package sytest-blacklist file.
| | * | | NewsfileErik Johnston2019-07-221-0/+1
| | | | |
| | * | | Don't package sytest-blacklist file.Erik Johnston2019-07-221-1/+1
| |/ / / | | | | | | | | | | | | I don't think its useful, and I don't even know where it would end up.
* | | | Fix logging in workers (#5729)Andrew Morgan2020-02-194-1/+32
|\| | |
| * | | Fix logging in workers (#5729)Amber Brown2019-07-224-1/+32
| | | | | | | | | | | | This also adds a worker blacklist.
* | | | Merge pull request #5730 from matrix-org/erikj/cache_versionsAndrew Morgan2020-02-190-0/+0
|\| | |
| * | | Merge pull request #5730 from matrix-org/erikj/cache_versionsErik Johnston2019-07-222-2/+22
| |\ \ \ | | | | | | | | | | Cache get_version_string.
* | | | | Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-typeAndrew Morgan2020-02-192-3/+4
|\| | | |
| * | | | Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-typeJason Robinson2019-07-222-3/+4
| |\ \ \ \ | | | | | | | | | | | | Add `user_type` to returned fields in admin API user list endpoints
| | * | | | Add `user_type` to returned fields in admin API user list endpointsJason Robinson2019-07-222-3/+4
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly user type will be empty (normal user) but there is also the "support" user type. Signed-off-by: Jason Robinson <jasonr@matrix.org>
* | | | | Update changelog.d/5730.miscAndrew Morgan2020-02-191-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Update changelog.d/5730.miscErik Johnston2019-07-221-1/+1
| | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* | | | | Fix stack overflow in Keyring (#5724)Andrew Morgan2020-02-193-80/+42
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix stack overflow in Keyring (#5724)Richard van der Hoff2019-07-223-80/+42
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Refactor Keyring._start_key_lookups There's an awful lot of deferreds and dictionaries flying around here. The whole thing can be made much simpler and achieve the same effect. * Add a delay to key lookup lock release to fix stack overflow A tactical call_later here should fix #5723 * changelog
| | * | | | changelogRichard van der Hoff2019-07-191-0/+1
| | | | | |
| | * | | | Add a delay to key lookup lock release to fix stack overflowRichard van der Hoff2019-07-191-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | A tactical call_later here should fix #5723
| | * | | | Refactor Keyring._start_key_lookupsRichard van der Hoff2019-07-192-80/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's an awful lot of deferreds and dictionaries flying around here. The whole thing can be made much simpler and achieve the same effect.
* | | | | | Merge tag 'v1.2.0rc1' into developAndrew Morgan2020-02-190-0/+0
|\| | | | |
| * | | | | Merge tag 'v1.2.0rc1' into developAndrew Morgan2019-07-2254-56/+82
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v1.2.0rc1 Features -------- - Add support for opentracing. ([\#5544](https://github.com/matrix-org/synapse/issues/5544), [\#5712](https://github.com/matrix-org/synapse/issues/5712)) - Add ability to pull all locally stored events out of synapse that a particular user can see. ([\#5589](https://github.com/matrix-org/synapse/issues/5589)) - Add a basic admin command app to allow server operators to run Synapse admin commands separately from the main production instance. ([\#5597](https://github.com/matrix-org/synapse/issues/5597)) - Add `sender` and `origin_server_ts` fields to `m.replace`. ([\#5613](https://github.com/matrix-org/synapse/issues/5613)) - Add default push rule to ignore reactions. ([\#5623](https://github.com/matrix-org/synapse/issues/5623)) - Include the original event when asking for its relations. ([\#5626](https://github.com/matrix-org/synapse/issues/5626)) - Implement `session_lifetime` configuration option, after which access tokens will expire. ([\#5660](https://github.com/matrix-org/synapse/issues/5660)) - Return "This account has been deactivated" when a deactivated user tries to login. ([\#5674](https://github.com/matrix-org/synapse/issues/5674)) - Enable aggregations support by default ([\#5714](https://github.com/matrix-org/synapse/issues/5714)) Bugfixes -------- - Fix 'utime went backwards' errors on daemonization. ([\#5609](https://github.com/matrix-org/synapse/issues/5609)) - Various minor fixes to the federation request rate limiter. ([\#5621](https://github.com/matrix-org/synapse/issues/5621)) - Forbid viewing relations on an event once it has been redacted. ([\#5629](https://github.com/matrix-org/synapse/issues/5629)) - Fix requests to the `/store_invite` endpoint of identity servers being sent in the wrong format. ([\#5638](https://github.com/matrix-org/synapse/issues/5638)) - Fix newly-registered users not being able to lookup their own profile without joining a room. ([\#5644](https://github.com/matrix-org/synapse/issues/5644)) - Fix bug in #5626 that prevented the original_event field from actually having the contents of the original event in a call to `/relations`. ([\#5654](https://github.com/matrix-org/synapse/issues/5654)) - Fix 3PID bind requests being sent to identity servers as `application/x-form-www-urlencoded` data, which is deprecated. ([\#5658](https://github.com/matrix-org/synapse/issues/5658)) - Fix some problems with authenticating redactions in recent room versions. ([\#5699](https://github.com/matrix-org/synapse/issues/5699), [\#5700](https://github.com/matrix-org/synapse/issues/5700), [\#5707](https://github.com/matrix-org/synapse/issues/5707)) - Ignore redactions of m.room.create events. ([\#5701](https://github.com/matrix-org/synapse/issues/5701)) Updates to the Docker image --------------------------- - Base Docker image on a newer Alpine Linux version (3.8 -> 3.10). ([\#5619](https://github.com/matrix-org/synapse/issues/5619)) - Add missing space in default logging file format generated by the Docker image. ([\#5620](https://github.com/matrix-org/synapse/issues/5620)) Improved Documentation ---------------------- - Add information about nginx normalisation to reverse_proxy.rst. Contributed by @skalarproduktraum - thanks! ([\#5397](https://github.com/matrix-org/synapse/issues/5397)) - --no-pep517 should be --no-use-pep517 in the documentation to setup the development environment. ([\#5651](https://github.com/matrix-org/synapse/issues/5651)) - Improvements to Postgres setup instructions. Contributed by @Lrizika - thanks! ([\#5661](https://github.com/matrix-org/synapse/issues/5661)) - Minor tweaks to postgres documentation. ([\#5675](https://github.com/matrix-org/synapse/issues/5675)) Deprecations and Removals ------------------------- - Remove support for the `invite_3pid_guest` configuration setting. ([\#5625](https://github.com/matrix-org/synapse/issues/5625)) Internal Changes ---------------- - Move logging code out of `synapse.util` and into `synapse.logging`. ([\#5606](https://github.com/matrix-org/synapse/issues/5606), [\#5617](https://github.com/matrix-org/synapse/issues/5617)) - Add a blacklist file to the repo to blacklist certain sytests from failing CI. ([\#5611](https://github.com/matrix-org/synapse/issues/5611)) - Make runtime errors surrounding password reset emails much clearer. ([\#5616](https://github.com/matrix-org/synapse/issues/5616)) - Remove dead code for persiting outgoing federation transactions. ([\#5622](https://github.com/matrix-org/synapse/issues/5622)) - Add `lint.sh` to the scripts-dev folder which will run all linting steps required by CI. ([\#5627](https://github.com/matrix-org/synapse/issues/5627)) - Move RegistrationHandler.get_or_create_user to test code. ([\#5628](https://github.com/matrix-org/synapse/issues/5628)) - Add some more common python virtual-environment paths to the black exclusion list. ([\#5630](https://github.com/matrix-org/synapse/issues/5630)) - Some counter metrics exposed over Prometheus have been renamed, with the old names preserved for backwards compatibility and deprecated. See `docs/metrics-howto.rst` for details. ([\#5636](https://github.com/matrix-org/synapse/issues/5636)) - Unblacklist some user_directory sytests. ([\#5637](https://github.com/matrix-org/synapse/issues/5637)) - Factor out some redundant code in the login implementation. ([\#5639](https://github.com/matrix-org/synapse/issues/5639)) - Update ModuleApi to avoid register(generate_token=True). ([\#5640](https://github.com/matrix-org/synapse/issues/5640)) - Remove access-token support from `RegistrationHandler.register`, and rename it. ([\#5641](https://github.com/matrix-org/synapse/issues/5641)) - Remove access-token support from `RegistrationStore.register`, and rename it. ([\#5642](https://github.com/matrix-org/synapse/issues/5642)) - Improve logging for auto-join when a new user is created. ([\#5643](https://github.com/matrix-org/synapse/issues/5643)) - Remove unused and unnecessary check for FederationDeniedError in _exception_to_failure. ([\#5645](https://github.com/matrix-org/synapse/issues/5645)) - Fix a small typo in a code comment. ([\#5655](https://github.com/matrix-org/synapse/issues/5655)) - Clean up exception handling around client access tokens. ([\#5656](https://github.com/matrix-org/synapse/issues/5656)) - Add a mechanism for per-test homeserver configuration in the unit tests. ([\#5657](https://github.com/matrix-org/synapse/issues/5657)) - Inline issue_access_token. ([\#5659](https://github.com/matrix-org/synapse/issues/5659)) - Update the sytest BuildKite configuration to checkout Synapse in `/src`. ([\#5664](https://github.com/matrix-org/synapse/issues/5664)) - Add a `docker` type to the towncrier configuration. ([\#5673](https://github.com/matrix-org/synapse/issues/5673)) - Convert `synapse.federation.transport.server` to `async`. Might improve some stack traces. ([\#5689](https://github.com/matrix-org/synapse/issues/5689)) - Documentation for opentracing. ([\#5703](https://github.com/matrix-org/synapse/issues/5703))
* | | | | NewsfileAndrew Morgan2020-02-191-0/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | NewsfileErik Johnston2019-07-221-0/+1
| | | | |
* | | | | Make changelog slightly more readableAndrew Morgan2020-02-191-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Make changelog slightly more readable v1.2.0rc1Andrew Morgan2019-07-221-1/+1
| | | | |
* | | | | Cache get_version_string.Andrew Morgan2020-02-191-2/+21
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Cache get_version_string.Erik Johnston2019-07-221-2/+21
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version of a module isn't going to change over the lifetime of the process (assuming no funky hot reloading is going on, which it isn't), so let's just cache the result to avoid spawning lots of git subprocesses. Fixes #5672.
* | | | 1.2.0rc1Andrew Morgan2020-02-1954-56/+82
|\ \ \ \ | | |/ / | |/| |
| * | | 1.2.0rc1Andrew Morgan2019-07-2254-56/+82
| | | |
* | | | Demo uses deprecated cli option (#5725)Andrew Morgan2020-02-192-4/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Demo uses deprecated cli option (#5725)Jorik Schellekens2019-07-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | * Remove deprecated 'verbose' cli arg * Create 5725.bugfix
* | | | Merge branch 'release-v1.2.0' into developAndrew Morgan2020-02-190-0/+0
|\| | |
| * | | Merge branch 'release-v1.2.0' into developJorik Schellekens2019-07-225-24/+230
| |\| |
* | | | Revert "Remove deprecated 'verbose' cli arg"Andrew Morgan2020-02-190-0/+0
|\| | |
| * | | Revert "Remove deprecated 'verbose' cli arg"Jorik Schellekens2019-07-191-3/+4
| | | | | | | | | | | | | | | | This reverts commit dc7cf81267e464858c74e6215184de0c634e2b26.
| * | | Remove deprecated 'verbose' cli argJorik Schellekens2019-07-191-4/+3
| | | |
* | | | Opentracing Documentation (#5703)Andrew Morgan2020-02-195-24/+230
|\ \ \ \ | | |/ / | |/| |
| * | | Opentracing Documentation (#5703)Jorik Schellekens2019-07-225-24/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Opentracing survival guide * Update decorator names in doc * Doc cleanup These are all alterations as a result of comments in #5703, it includes mostly typos and clarifications. The most interesting changes are: - Split developer and user docs into two sections - Add a high level description of OpenTracing * newsfile * Move contributer specific info to docstring. * Sample config. * Trailing whitespace. * Update 5703.misc * Apply suggestions from code review Mostly just rewording parts of the docs for clarity. Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>