summary refs log tree commit diff
path: root/synapse/storage (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:matrix-org/synapse into developDaniel Wagner-Hall2015-11-041-2/+1
|\
| * Merge branch 'develop' into daniel/removesomeliesMark Haines2015-11-044-32/+272
| |\
| * | Remove more unused parametersDaniel Wagner-Hall2015-11-021-2/+1
* | | Allow guests to register and call /events?room_id=Daniel Wagner-Hall2015-11-041-7/+8
| |/ |/|
* | Merge pull request #343 from matrix-org/erikj/fix_retriesErik Johnston2015-11-031-32/+16
|\ \
| * | Fix broken cache for getting retry times. This meant we retried remote destin...Erik Johnston2015-11-031-32/+16
| |/
* | Merge pull request #335 from matrix-org/markjh/room_tagsMark Haines2015-11-033-0/+256
|\ \ | |/ |/|
| * Spell "deferred" more correctlyMark Haines2015-11-031-1/+1
| * Store room tag content and return the content in the m.tag eventMark Haines2015-11-022-16/+29
| * Merge branch 'develop' into markjh/room_tagsMark Haines2015-11-021-1/+136
| |\
| * | Inform the client of new room tags using v1 /eventsMark Haines2015-10-291-1/+15
| * | Fix pyflakes errorsMark Haines2015-10-281-3/+3
| * | Add APIs for adding and removing tags from roomsMark Haines2015-10-283-0/+229
* | | Add missing columnDaniel Wagner-Hall2015-10-301-1/+1
| |/ |/|
* | DocsErik Johnston2015-10-281-0/+26
* | Add room context apiErik Johnston2015-10-281-1/+110
|/
* Pull out sender when computing search resultsErik Johnston2015-10-231-14/+17
* Implement rank function for SQLite FTSErik Johnston2015-10-233-2/+30
* Actually filter resultsErik Johnston2015-10-221-3/+5
* LESS THANErik Johnston2015-10-221-1/+2
* Use namedtuple as return valueErik Johnston2015-10-221-3/+15
* Limit max number of SQL varsErik Johnston2015-10-221-4/+6
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-221-0/+13
|\
| * Merge pull request #316 from matrix-org/markjh/v2_sync_archivedMark Haines2015-10-211-0/+13
| |\
| | * Include banned rooms in the archived section of v2 syncMark Haines2015-10-211-2/+2
| | * Add rooms that the user has left under archived in v2 sync.Mark Haines2015-10-191-0/+13
* | | PEP8Erik Johnston2015-10-221-1/+2
* | | Move FTS to delta 25Erik Johnston2015-10-222-3/+3
|/ /
* | Explicitly check for Sqlite3EngineErik Johnston2015-10-161-2/+5
* | TypingErik Johnston2015-10-161-2/+2
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-161-1/+1
|\|
| * Fix FilteringStore.get_user_filter to work with postgresMark Haines2015-10-161-1/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-161-2/+2
|\|
| * Encode the filter JSON as UTF-8 before storing in the database.Mark Haines2015-10-161-2/+2
* | Explicitly check for Sqlite3EngineErik Johnston2015-10-161-2/+5
* | Add docstringErik Johnston2015-10-161-0/+11
* | Comment on the LIMIT 500Erik Johnston2015-10-161-0/+2
* | Split up run_upgradeErik Johnston2015-10-161-5/+11
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-151-0/+14
|\|
| * Merge pull request #305 from matrix-org/markjh/v2_sync_apiMark Haines2015-10-141-0/+14
| |\
| | * Merge branch 'develop' into markjh/v2_sync_apiMark Haines2015-10-144-377/+399
| | |\
| | * | Add a get_invites_for_user method to the storage to find out the rooms a user...Mark Haines2015-10-131-0/+14
| * | | Remove unused room_id argErik Johnston2015-10-141-5/+5
| | |/ | |/|
* | | Fix to work with SQLiteErik Johnston2015-10-141-4/+11
* | | Add paranoia limitErik Johnston2015-10-131-1/+1
* | | Remove constraints in preperation of using filtersErik Johnston2015-10-131-20/+10
* | | Merge branch 'erikj/store_engine' into erikj/searchErik Johnston2015-10-134-3/+3
|\| |
| * | rename schema_prepare to prepare_databaseErik Johnston2015-10-133-2/+2
* | | Add SQLite supportErik Johnston2015-10-131-5/+12
* | | Merge branch 'erikj/store_engine' into erikj/searchErik Johnston2015-10-135-378/+400
|\| |
| * | Expose error more nicelyErik Johnston2015-10-134-5/+2
| * | Split out the schema preparation and update logic into its own moduleErik Johnston2015-10-134-377/+402
| |/
* | Add sqlite schemaErik Johnston2015-10-131-5/+64
* | Filter events to only thsoe that the user is allowed to seeErik Johnston2015-10-121-7/+7
* | Remove unused room_id parameterErik Johnston2015-10-121-6/+5
* | Keep FTS indexes up to date. Only search through rooms currently joinedErik Johnston2015-10-124-2/+32
* | Add basic full text search impl.Erik Johnston2015-10-094-1/+135
|/
* Merge pull request #288 from matrix-org/markjh/unused_definitionsMark Haines2015-09-287-419/+2
|\
| * synapse/storage/state.py: _make_group_id was unusedMark Haines2015-09-231-6/+0
| * Remove unused functions from synapse/storage/signatures.pyMark Haines2015-09-231-112/+0
| * synapse/storage/roommember.py:_get_members_query was unusedMark Haines2015-09-231-6/+0
| * Remove unused functions from synapse/storage/events.pyMark Haines2015-09-231-11/+0
| * Remove unused functions from synapse/storage/event_federation.pyMark Haines2015-09-231-71/+0
| * synapse/storage/_base.py:_simple_max_id was unusedMark Haines2015-09-231-18/+0
| * synapse/storage/_base.py:_simple_delete was unusedMark Haines2015-09-231-10/+0
| * synapse/storage/_base.py:_simple_selectupdate_one was unusedMark Haines2015-09-231-31/+0
| * synapse/storage/event_federation.py:_get_auth_events is unusedMark Haines2015-09-221-21/+0
| * synapse/storage/_base.py:_execute_and_decode was unusedMark Haines2015-09-221-3/+0
| * synapse/storage/_base.py:Table was unusedMark Haines2015-09-222-130/+2
* | Fix order of ON constraints in _get_rooms_for_user_where_membership_is_txnMark Haines2015-09-241-6/+6
|/
* Add some docstringsDaniel Wagner-Hall2015-09-222-0/+4
* Add docstringDaniel Wagner-Hall2015-09-221-0/+6
* Implement configurable stats reportingDaniel Wagner-Hall2015-09-224-2/+110
* Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_be...Mark Haines2015-09-212-10/+38
|\
| * Allow users that have left a room to get the messages that happend in the roo...Mark Haines2015-09-091-1/+18
| * Remove undocumented and unimplemented 'feedback' parameter from the Client-Se...Mark Haines2015-09-091-8/+2
| * Allow room initialSync for users that have left the room, returning a snapsho...Mark Haines2015-09-091-0/+15
| * Include the event_id and stream_ordering of membership events when looking up...Mark Haines2015-09-081-2/+4
* | Merge pull request #281 from matrix-org/erikj/update_extremetiesErik Johnston2015-09-152-0/+11
|\ \
| * | "Comments"Erik Johnston2015-09-151-0/+6
| * | When updating a stored event from outlier to non-outlier, remember to update ...Erik Johnston2015-09-152-0/+5
* | | Drop unused indexErik Johnston2015-09-141-0/+16
| |/ |/|
* | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into developErik Johnston2015-09-011-1/+1
|\|
| * Lower size of 'stateGroupCache' now that we have data from matrix.org to supp...Erik Johnston2015-09-011-1/+1
* | Merge branch 'release-v0.10.0' into developMark Haines2015-08-282-4/+17
|\|
| * Don't insert events into 'event_*_extremeties' tables if they're outliersErik Johnston2015-08-231-2/+8
| * Actually check if event_id isn't returned by _get_state_groupsErik Johnston2015-08-211-2/+9
| * When logging in fetch user by user_id case insensitively, *unless* there are ...Erik Johnston2015-08-211-2/+5
| * Don't allow people to register user ids which only differ by case to an exist...Erik Johnston2015-08-211-0/+11
* | Merge erikj/user_dedup to developDaniel Wagner-Hall2015-08-261-0/+14
* | Merge pull request #251 from matrix-org/removeadminDaniel Wagner-Hall2015-08-251-3/+2
|\ \
| * | Stop looking up "admin", which we never readDaniel Wagner-Hall2015-08-251-3/+2
* | | Merge pull request #248 from matrix-org/deviceidDaniel Wagner-Hall2015-08-252-7/+5
|\| |
| * | Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-252-7/+5
* | | Merge pull request #243 from matrix-org/markjh/remove_syutilMark Haines2015-08-256-16/+17
|\ \ \ | |/ / |/| |
| * | Fix indentMark Haines2015-08-241-1/+1
| * | Remove syutil dependency in favour of smaller single-purpose librariesMark Haines2015-08-246-16/+17
* | | Remove autoincrement since we incrementing the ID in the storage layerMark Haines2015-08-241-1/+1
|/ /
* | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into developErik Johnston2015-08-211-0/+2
|\|
| * Fix bug where we didn't correctly serialize the redacted_because key over fed...Erik Johnston2015-08-211-0/+2
* | Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-201-0/+19
|\|
| * Merge pull request #211 from matrix-org/email_in_useMark Haines2015-08-201-0/+19
| |\
| | * Bump schema versionDavid Baker2015-08-041-1/+1
| | * Add endpoint that proxies ID server request token and errors if the given ema...David Baker2015-08-041-0/+19
* | | /tokenrefresh POST endpointDaniel Wagner-Hall2015-08-204-1/+85
* | | s/by_token/by_access_token/gDaniel Wagner-Hall2015-08-201-3/+3
|/ /
* | Merge pull request #228 from matrix-org/erikj/_get_state_for_groupsErik Johnston2015-08-181-2/+5
|\ \
| * | Remove newline because vertical whitespace makes mjark sadErik Johnston2015-08-181-2/+1
| * | Rejig the code to make it nicerErik Johnston2015-08-181-3/+2
| * | Ensure we never return a None event from _get_state_for_groupsErik Johnston2015-08-181-3/+8
* | | Merge pull request #227 from matrix-org/erikj/receipts_take2Erik Johnston2015-08-183-15/+91
|\ \ \
| * | | Rename unhelpful variable nameErik Johnston2015-08-181-7/+2
| * | | CommentsErik Johnston2015-08-181-4/+14
| * | | Add index receipts_linearized_room_streamErik Johnston2015-08-172-1/+19
| * | | Remove unused importErik Johnston2015-08-171-2/+0
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_t...Erik Johnston2015-08-172-8/+9
| |\ \ \
| * | | | Batch _get_linearized_receipts_for_roomsErik Johnston2015-08-141-15/+64
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_t...Erik Johnston2015-08-131-44/+12
| |\ \ \ \
| * | | | | Add metrics to the receipts cacheErik Johnston2015-08-131-0/+6
* | | | | | Bump size of get_presence_state cacheErik Johnston2015-08-181-1/+1
| |_|_|/ / |/| | | |
* | | | | Reduce cache size from obscenely large to quite largeErik Johnston2015-08-181-1/+1
* | | | | Remember to invalidate cachesErik Johnston2015-08-171-2/+8
* | | | | Implement a batched presence_handler.get_state and use itErik Johnston2015-08-171-2/+4
* | | | | Add batched version of store.get_presence_stateErik Johnston2015-08-171-1/+19
| |_|/ / |/| | |
* | | | Fix bug where we were leaking None into state event listsErik Johnston2015-08-171-2/+3
* | | | Merge pull request #221 from matrix-org/authDaniel Wagner-Hall2015-08-141-6/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Simplify LoginHander and AuthHandlerDaniel Wagner-Hall2015-08-121-6/+6
| * | | Use TypeError instead of ValueError and give a nicer error mesasgeMark Haines2015-08-101-1/+3
| * | | Merge pull request #215 from matrix-org/erikj/cache_varargs_interfaceErik Johnston2015-08-1011-66/+67
| |\ \ \
* | | | | Remove some vertical spaceErik Johnston2015-08-131-36/+9
* | | | | Replace list comprehensionErik Johnston2015-08-131-8/+3
| |_|/ / |/| | |
* | | | CommentErik Johnston2015-08-121-1/+2
* | | | Explain why we're prefilling dict with NonesErik Johnston2015-08-121-0/+4
* | | | Better variable nameErik Johnston2015-08-121-5/+5
* | | | Split _get_state_for_group_from_cache into twoErik Johnston2015-08-121-32/+53
* | | | Move all the caches into their own package, synapse.util.cachesErik Johnston2015-08-1113-344/+29
* | | | CommentsErik Johnston2015-08-112-3/+13
* | | | CommentErik Johnston2015-08-111-0/+2
* | | | DocsErik Johnston2015-08-111-0/+9
* | | | Fix application of ACLsErik Johnston2015-08-111-3/+3
* | | | Fix state cacheErik Johnston2015-08-111-36/+49
* | | | Clean up StateStoreErik Johnston2015-08-101-62/+11
* | | | Remove unused functionErik Johnston2015-08-101-7/+0
* | | | CommentsErik Johnston2015-08-101-0/+6
* | | | Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse...Erik Johnston2015-08-101-5/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Rename keyargs to args in CacheDescriptorErik Johnston2015-08-101-5/+5
* | | | Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse...Erik Johnston2015-08-101-9/+9
|\| | |
| * | | Rename keyargs to args in CacheErik Johnston2015-08-101-9/+9
* | | | Do bounds checkErik Johnston2015-08-101-1/+4
* | | | Line lengthErik Johnston2015-08-101-1/+2
* | | | Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse...Erik Johnston2015-08-071-1/+0
|\| | |
| * | | Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into er...Erik Johnston2015-08-071-3/+3
| |\ \ \
| * \ \ \ Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into er...Erik Johnston2015-08-071-3/+4
| |\ \ \ \
| * | | | | Remove unnecessary cacheErik Johnston2015-08-071-2/+1
| * | | | | Change Cache to not use *args in its interfaceErik Johnston2015-08-0710-61/+63
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...Erik Johnston2015-08-072-3/+9
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #212 from matrix-org/erikj/cache_deferredsErik Johnston2015-08-071-13/+33
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | s/observed/observer/Erik Johnston2015-08-071-3/+3
| | | |/ / | | |/| |
| | * | | Propogate stale cache errors to calling functionsErik Johnston2015-08-071-3/+4
| | |/ /
| * | | Don't complain about extra .pyc files we find while hunting for database schemasPaul "LeoNerd" Evans2015-08-071-0/+5
* | | | Batch up various DB requests for event -> stateErik Johnston2015-08-071-77/+142
* | | | Implement a CacheListDescriptorErik Johnston2015-08-071-0/+106
* | | | Cache get_recent_events_for_roomErik Johnston2015-08-071-2/+2
* | | | Remove unncessary cacheErik Johnston2015-08-071-1/+0
* | | | Change Cache to not use *args in its interfaceErik Johnston2015-08-0710-81/+67
* | | | Store absence of state in cacheErik Johnston2015-08-071-6/+16
* | | | Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cacheErik Johnston2015-08-061-3/+27
|\ \ \ \ | | |/ / | |/| |
| * | | DocsErik Johnston2015-08-061-0/+3
| * | | Remove failed deferreds from cacheErik Johnston2015-08-061-1/+7
| * | | Re-implement DEBUG_CACHES flagErik Johnston2015-08-061-2/+17
* | | | Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cacheErik Johnston2015-08-061-13/+8
|\| | |
| * | | Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferredsErik Johnston2015-08-062-5/+5
| |\| |
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cached_key...Erik Johnston2015-08-062-5/+5
| | |\ \
| * | | | Make @cached cache deferreds rather than the deferreds' valuesErik Johnston2015-08-061-13/+8
| |/ / /
* | | | Merge branch 'erikj/cached_keyword_args' of github.com:matrix-org/synapse int...Erik Johnston2015-08-056-23/+45
|\| | |
| * | | Add support for using keyword arguments with cached functionsErik Johnston2015-07-276-23/+45
| | |/ | |/|
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...Erik Johnston2015-08-052-5/+5
|\ \ \ | | |/ | |/|
| * | Up the cache size for 'get_joined_hosts_for_room' and 'get_users_in_room'Erik Johnston2015-08-051-2/+2
| * | Use LRU cache by defaultErik Johnston2015-08-051-3/+3
| |/
* | Use dictionary cache to do group -> state fetchingErik Johnston2015-08-053-80/+153
* | Move DictionaryCacheErik Johnston2015-08-041-94/+0
* | Add basic dictionary cacheErik Johnston2015-08-041-0/+94
* | Add commentErik Johnston2015-08-041-0/+15
* | Speed up event filtering (for ACL) logicErik Johnston2015-08-042-40/+87
|/
* Dodesn't seem to make any difference: guess it does work with the object refe...David Baker2015-07-211-1/+0
* I think this was what was intended...David Baker2015-07-211-0/+1
* s/take/claim/ for end to end key APIsMark Haines2015-07-201-3/+3
* Up default cache size for _RoomStreamChangeCacheMatrix2015-07-181-1/+1
* Merge pull request #199 from matrix-org/erikj/receiptsErik Johnston2015-07-165-3/+396
|\
| * DocsErik Johnston2015-07-141-3/+28
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-135-21/+253
| |\
| * | CommentsErik Johnston2015-07-131-0/+11
| * | Handle error slightly betterErik Johnston2015-07-091-2/+2
| * | Change format of receipts to allow inclusion of dataErik Johnston2015-07-092-29/+26
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-081-2/+4
| |\ \
| * | | Add a cache to fetching of receipt streamsErik Johnston2015-07-081-3/+89
| * | | Hook up receipts to v1 initialSyncErik Johnston2015-07-081-9/+20
| * | | Wire together receipts and the notifer/federationErik Johnston2015-07-071-9/+60
| * | | Fix various typosErik Johnston2015-07-072-6/+10
| * | | Add stream_id indexErik Johnston2015-07-021-1/+5
| * | | Add basic storage functions for handling of receiptsErik Johnston2015-07-014-17/+186
| * | | Add tables for receiptsErik Johnston2015-06-302-1/+36
* | | | Merge pull request #193 from matrix-org/erikj/bulk_persist_eventErik Johnston2015-07-146-270/+382
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove commented out codeErik Johnston2015-07-101-14/+0
| * | | Add bulk insert events APIErik Johnston2015-06-256-268/+394
| |/ /
* | | Merge pull request #196 from matrix-org/erikj/room_historyErik Johnston2015-07-101-2/+61
|\ \ \
| * | | Add basic impl for room history ACL on GET /messages client APIErik Johnston2015-07-021-2/+61
| |/ /
* | | Merge pull request #194 from matrix-org/erikj/bulk_verify_sigsErik Johnston2015-07-101-19/+31
|\ \ \
| * | | Implement bulk verify_signed_json APIErik Johnston2015-06-261-19/+31
| |/ /
* | | Uniquely name unique constraintErik Johnston2015-07-101-2/+2
* | | Don't bother with a timeout for one time keys on the server.Mark Haines2015-07-092-15/+6
* | | Only remove one time keys when new one time keys are addedMark Haines2015-07-081-7/+7
* | | Add store for client end to end keysMark Haines2015-07-063-1/+171
| |/ |/|
* | Don't explode if we don't recognize one of the event_ids in the backfill requestErik Johnston2015-07-061-2/+4
|/
* Batch SELECTs in _get_auth_chain_ids_txnErik Johnston2015-06-231-3/+11
* Add a dummy.sql into delta/20 as pip isn't packinging the pushers.pyErik Johnston2015-06-131-0/+1
* Bump schema versionErik Johnston2015-06-111-1/+1
* pep8David Baker2015-06-041-1/+0
* Add script to (re)convert the pushers table to changing the unique key. Also ...David Baker2015-06-043-2/+79
* Add cache to get_state_groupsErik Johnston2015-06-031-8/+12
* Caches should be bound to instances.Erik Johnston2015-06-031-14/+31
* Don't explode if we don't have the eventErik Johnston2015-06-011-1/+3
* Add config option to turn off freezing events. Use new encode_json api and uj...Erik Johnston2015-05-291-10/+13
* Merge pull request #163 from matrix-org/markjh/presence_list_cacheMark Haines2015-05-221-8/+27
|\
| * Add a cache for getting the presence list for a userMark Haines2015-05-221-8/+27
* | Merge pull request #164 from matrix-org/markjh/pusher_performance_2Mark Haines2015-05-221-1/+17
|\ \
| * | Add a cache for get_push rules for user, fix cache invalidationMark Haines2015-05-221-1/+17
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_f...Erik Johnston2015-05-227-16/+67
|\ \ \ | | |/ | |/|
| * | Merge pull request #156 from matrix-org/erikj/join_perfMark Haines2015-05-221-2/+3
| |\ \
| * | | Invalidate the get_latest_event_ids_in_room cache when deleting from event_fo...Mark Haines2015-05-221-0/+1
| | |/ | |/|
| * | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-05-226-16/+66
| |\ \
| | * | Don't try to use a txn when not in one, remove spurious debug loggingMark Haines2015-05-211-3/+1
| | * | Add caches for things requested by the pushersMark Haines2015-05-215-15/+33
| | * | Add a cache for get_current_state with state_keyMark Haines2015-05-213-1/+35
* | | | Actually return something from lambdaErik Johnston2015-05-211-1/+1
* | | | Sort backfill eventsErik Johnston2015-05-211-1/+5
* | | | Remove dead codeErik Johnston2015-05-211-5/+0
* | | | Only get non-stateErik Johnston2015-05-211-1/+2
* | | | Skip events we've already seenErik Johnston2015-05-211-0/+3
* | | | Correctly prepopulate queueErik Johnston2015-05-211-2/+10
* | | | Don't prepopulate event_resultsErik Johnston2015-05-211-1/+1
* | | | Don't readd things that are already in event_resultsErik Johnston2015-05-211-1/+2
* | | | PriorityQueue gives lowest firstErik Johnston2015-05-211-2/+2
* | | | Correctly capture Queue.Empty exceptionErik Johnston2015-05-211-2/+5
* | | | Merge branch 'erikj/join_perf' of github.com:matrix-org/synapse into erikj/ba...Erik Johnston2015-05-2110-181/+544
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perfErik Johnston2015-05-2110-181/+544
| |\| |
| | * | Merge pull request #155 from matrix-org/erikj/perfErik Johnston2015-05-2110-181/+544
| | |\ \
| | | * | s/for events/for requests for events/Erik Johnston2015-05-211-1/+1
| | | * | s/for events/for requests for events/Erik Johnston2015-05-211-1/+1
| | | * | Add commentsErik Johnston2015-05-211-3/+14