Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

add ?ts massaging for ASes - #2754

Merged
ara4n merged 2 commits into
developfrom
matthew/as_ts
Jan 23, 2018
Merged

ara4n merged 2 commits into
developfrom
matthew/as_ts

Conversation

@ara4n

@ara4n ara4n commented Jan 4, 2018

Copy link
Copy Markdown
Member

No description provided.

@ara4n
ara4n changed the base branch from master to develop January 4, 2018 19:11
@erikjohnston

erikjohnston commented Jan 4, 2018 •

Copy link
Copy Markdown
Member

Looks like it does the right think and doesn't clobber: https://github.com/matrix-org/synapse/blob/master/synapse/events/builder.py#L68

key_values.setdefault("origin_server_ts", time_now)

@ara4n

ara4n commented Jan 7, 2018

Copy link
Copy Markdown
Member Author

@erikjohnston ptal

@erikjohnston

Copy link
Copy Markdown
Member

The travis merged pr CI failure is due to the tests being broken on develop.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants