Erik Johnston c52e8d395b Merge pull request #61 from matrix-org/timeout-federation-requests ...

Timeout federation requests

2015-02-11 17:10:33 +00:00

..

api

During room intial sync, only calculate current state once.

2015-02-09 17:41:29 +00:00

app

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

2015-02-11 10:35:13 +00:00

config

Add a cache for get_event

2015-02-11 15:01:15 +00:00

crypto

Blunty replace json with simplejson

2015-02-11 14:23:10 +00:00

events

pyflakes

2015-02-11 16:52:22 +00:00

federation

Merge pull request #61 from matrix-org/timeout-federation-requests

2015-02-11 17:10:33 +00:00

handlers

Remove more debug logging

2015-02-11 16:51:22 +00:00

http

Merge pull request #61 from matrix-org/timeout-federation-requests

2015-02-11 17:10:33 +00:00

push

Blunty replace json with simplejson

2015-02-11 14:23:10 +00:00

rest

Blunty replace json with simplejson

2015-02-11 14:23:10 +00:00

storage

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

2015-02-11 17:01:38 +00:00

streams

Update copyright notices

2015-01-06 13:21:39 +00:00

util

Merge pull request #61 from matrix-org/timeout-federation-requests

2015-02-11 17:10:33 +00:00

__init__.py

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

2015-02-11 10:20:43 +00:00

notifier.py

Fix Formatting

2015-01-27 20:19:36 +00:00

python_dependencies.py

Bump syutil version

2015-02-11 17:02:52 +00:00

server.py

Merge changes from develop

2015-01-29 14:55:27 +00:00

state.py

Remove unnecessary logging

2015-02-10 15:45:50 +00:00

types.py

Rename ClientID to ClientInfo since it is a pair of IDs rather than a single identifier

2015-01-28 17:16:12 +00:00