5bdb57cb66
Merge pull request #3015 from matrix-org/erikj/simplejson_replication
...
Fix replication after switch to simplejson
2018-03-20 15:06:33 +00:00
f5aa027c2f
Update CHANGES.rst
...
rearrange ordering of releases to match chronology
2018-03-20 15:06:22 +00:00
e66fbcbb02
fix merge conflicts
2018-03-20 14:25:31 +00:00
9aa5a0af51
Explicitly use simplejson
2018-03-20 09:58:13 +00:00
610accbb7f
Fix replication after switch to simplejson
...
Turns out that simplejson serialises namedtuple's as dictionaries rather
than tuples by default.
2018-03-19 16:12:48 +00:00
c384705ee8
Update __init__.py
...
bump version
2018-03-19 15:11:58 +00:00
1a3aa957ca
Update CHANGES.rst
2018-03-19 15:11:00 +00:00
3f961e638a
Merge pull request #3005 from matrix-org/erikj/fix_cache_size
...
Fix bug where state cache used lots of memory
2018-03-19 11:44:26 +00:00
fa72803490
Merge branch 'master' of github.com:matrix-org/synapse into develop
2018-03-19 11:41:01 +00:00
9a0d783c11
Add comments
2018-03-19 11:35:53 +00:00
38f952b9bc
spell out not to massively increase bcrypt rounds
2018-03-19 09:27:36 +00:00
a8ce159be4
Replace some ujson with simplejson to make it work
2018-03-16 00:27:09 +00:00
f609acc109
Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse
2018-03-16 00:13:51 +00:00
0092cf38ae
Newline
2018-03-16 00:11:58 +00:00
5b631ff41a
Remove wrong comment
2018-03-16 00:07:08 +00:00
ba48755d56
Bump version and changelog
2018-03-15 23:57:26 +00:00
926ba76e23
Replace ujson with simplejson
2018-03-15 23:43:31 +00:00
9cf519769b
Use .iter* to avoid copies in StateHandler
2018-03-15 17:50:26 +00:00
7c7706f42b
Fix bug where state cache used lots of memory
...
The state cache bases its size on the sum of the size of entries. The
size of the entry is calculated once on insertion, so it is important
that the size of entries does not change.
The DictionaryCache modified the entries size, which caused the state
cache to incorrectly think it was smaller than it actually was.
2018-03-15 15:46:54 +00:00
2cc9f76bc3
replace old style error catching with 'as' keyword
...
This is both easier to read and compatible with python3 (not that that
matters)
Signed-off-by: Adrian Tschira <nota@notafile.com>
2018-03-15 16:11:17 +01:00
ddb00efc1d
Bump version number
2018-03-15 14:41:30 +00:00
2a376579f3
Merge pull request #3003 from matrix-org/rav/fix_contributing
...
CONTRIBUTING.rst: fix CI info
2018-03-15 13:31:59 +00:00
873aea7168
Merge pull request #3002 from matrix-org/rav/purge_doc
...
Update purge_history_api.rst
2018-03-15 13:31:54 +00:00
bf7ee93cb6
Merge pull request #2997 from turt2live/patch-2
...
Doc: Make the event_creator routes regex a code block
2018-03-15 13:12:44 +00:00
5ea624b0f5
CONTRIBUTING.rst: fix CI info
2018-03-15 11:48:35 +00:00
0ad5125814
Update purge_history_api.rst
...
clarify that `purge_history` will not purge state
2018-03-15 11:05:42 +00:00
068c21ab10
CHANGES.rst: reword metric deprecation
2018-03-15 10:36:31 +00:00
b29d1abab6
Update CHANGES.rst
2018-03-15 10:34:15 +00:00
7367a4a823
Update CHANGES.rst
2018-03-15 10:33:52 +00:00
7d26591048
Update CHANGES.rst
2018-03-15 10:33:24 +00:00
2059b8573f
Update CHANGES.rst
2018-03-14 18:11:21 +00:00
10fdcf561d
Fix up rst formatting
2018-03-14 17:30:17 +00:00
5ccb57d3ff
Update CHANGES.rst
2018-03-14 17:12:58 +00:00
c33c1ceddd
OCD: Make the event_creator routes regex a code block
...
All the others are code blocks, so this one should be to (currently it is a blockquote).
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-03-14 11:09:08 -06:00
fb647164f2
Update CHANGES.rst
2018-03-14 16:20:36 +00:00
a492b17fe2
Update CHANGES.rst
...
clean formatting
2018-03-14 16:18:09 +00:00
cb2c7c0669
Update CHANGES.rst
...
WIP, need to add most recent PRs
2018-03-14 16:09:20 +00:00
3959754de3
Merge pull request #2995 from matrix-org/erikj/enable_membership_worker
...
Register membership/state servlets in event_creator
2018-03-14 14:37:33 +00:00
4f28018c83
Register membership/state servlets in event_creator
2018-03-14 14:30:06 +00:00
57db62e554
Merge pull request #2992 from matrix-org/erikj/implement_member_workre
...
Implement RoomMemberWorkerHandler
2018-03-14 14:29:33 +00:00
0011ede3b0
Fix imports
2018-03-14 14:19:23 +00:00
62ad701326
s/join/joined/ in notify_user_membership_change
2018-03-14 14:17:43 +00:00
3f0f06cb31
Split RoomMemberWorkerHandler to separate file
2018-03-14 11:41:45 +00:00
3e839e0548
Merge pull request #2989 from matrix-org/erikj/profile_cache_master
...
Only update remote profile cache on master
2018-03-14 09:42:27 +00:00
ebd0127999
Merge pull request #2988 from matrix-org/erikj/split_profile_store
...
Split up ProfileStore
2018-03-14 09:41:06 +00:00
cfe75a9fb6
Merge pull request #2991 from matrix-org/erikj/fixup_rm
...
_remote_join and co take a requester
2018-03-14 09:40:57 +00:00
f51565e023
Merge pull request #2993 from matrix-org/erikj/is_blocked
...
Add is_blocked to worker store
2018-03-14 09:39:18 +00:00
d144ed6ffb
fix bug #2926 (loading all state for a given type from the DB if the state_key is None) ( #2990 )
...
Fixes a regression that had crept in where the caching layer upholds requests for loading state which is filtered by type (but not by state_key), but the DB layer itself would interpret a missing state_key as a request to filter by null state_key rather than returning all state_keys.
2018-03-13 22:36:04 +00:00
a08726fc42
Add is_blocked to worker store
2018-03-13 18:28:44 +00:00
b27320b550
Implement RoomMemberWorkerHandler
2018-03-13 18:26:00 +00:00
Erik Johnston