Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

da6a7bbd

Commit da6a7bbd authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/logging_context

parents 2236ef6c 51da9958

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

AUTHORS.rst 3 additions, 0 deletions

AUTHORS.rst
CHANGES.rst 2 additions, 0 deletions

CHANGES.rst
UPGRADE.rst 1 addition, 1 deletion

UPGRADE.rst
docs/application_services.rst 1 addition, 1 deletion

docs/application_services.rst
docs/postgres.rst 3 additions, 3 deletions

docs/postgres.rst
scripts-dev/convert_server_keys.py 113 additions, 0 deletions

scripts-dev/convert_server_keys.py
scripts/port_from_sqlite_to_postgres.py 5 additions, 4 deletions

scripts/port_from_sqlite_to_postgres.py
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/storage/__init__.py 1 addition, 1 deletion

synapse/storage/__init__.py
synapse/storage/_base.py 1 addition, 0 deletions

synapse/storage/_base.py
synapse/storage/events.py 19 additions, 19 deletions

synapse/storage/events.py
synapse/storage/push_rule.py 54 additions, 58 deletions

synapse/storage/push_rule.py
synapse/storage/schema/delta/18/server_keys_bigger_ints.sql 32 additions, 0 deletions

synapse/storage/schema/delta/18/server_keys_bigger_ints.sql
synapse/storage/util/id_generators.py 8 additions, 4 deletions

synapse/storage/util/id_generators.py

with 244 additions and 92 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment