Mark Haines 4ad8b45155 Merge branch 'develop' into key_distribution ...

Conflicts:
	synapse/config/homeserver.py

2015-04-29 13:15:14 +01:00

..

engines

Shuffle operations so that locking upsert happens last in the txn. This ensures the lock is held for the least amount of time possible.

2015-04-27 13:22:30 +01:00

schema

Merge branch 'develop' into key_distribution

2015-04-29 13:15:14 +01:00

util

Make get_max_token into inlineCallbacks so that the lock works.

2015-04-27 15:19:44 +01:00

__init__.py

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

2015-04-28 13:39:42 +01:00

_base.py

Shuffle operations so that locking upsert happens last in the txn. This ensures the lock is held for the least amount of time possible.

2015-04-27 13:22:30 +01:00

appservice.py

Go back to storing JSON in TEXT

2015-04-16 11:17:52 +01:00

directory.py

Use generic db exceptions rather than sqlite3 specific ones

2015-04-08 16:53:48 +01:00

event_federation.py

Add support for postgres instead of mysql. Change sql accourdingly. blob + varbinary -> bytea. No support for UNSIGNED or CREATE INDEX IF NOT EXISTS.

2015-04-14 13:53:20 +01:00

events.py

Shuffle operations so that locking upsert happens last in the txn. This ensures the lock is held for the least amount of time possible.

2015-04-27 13:22:30 +01:00

filtering.py

Give sensible names for '_simple_...' transactions

2015-03-20 15:59:18 +00:00

keys.py

Merge branch 'develop' into key_distribution

2015-04-29 13:15:14 +01:00

media_repository.py

Give sensible names for '_simple_...' transactions

2015-03-20 15:59:18 +00:00

presence.py

Implement or_ignore flag on inserts

2015-04-07 12:06:22 +01:00

profile.py

Revert needless change to storage.profile

2015-04-17 16:13:14 +01:00

push_rule.py

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

2015-03-20 16:31:48 +00:00

pusher.py

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

2015-04-28 13:39:42 +01:00

registration.py

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

2015-04-28 13:39:42 +01:00

rejections.py

Give sensible names for '_simple_...' transactions

2015-03-20 15:59:18 +00:00

room.py

Add support for postgres instead of mysql. Change sql accourdingly. blob + varbinary -> bytea. No support for UNSIGNED or CREATE INDEX IF NOT EXISTS.

2015-04-14 13:53:20 +01:00

roommember.py

PEP8

2015-04-07 12:16:05 +01:00

signatures.py

Make work in both Maria and SQLite. Fix tests

2015-04-01 14:12:33 +01:00

state.py

For backwards compat, make state_groups.id have a type of int, not varchar

2015-04-13 17:03:49 +01:00

stream.py

Add support for postgres instead of mysql. Change sql accourdingly. blob + varbinary -> bytea. No support for UNSIGNED or CREATE INDEX IF NOT EXISTS.

2015-04-14 13:53:20 +01:00

transactions.py

Shuffle operations so that locking upsert happens last in the txn. This ensures the lock is held for the least amount of time possible.

2015-04-27 13:22:30 +01:00