diff options
| author | Erik Johnston <erik@matrix.org> | 2016-03-18 15:02:43 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-03-18 15:02:43 +0000 |
| commit | 1660145a082470b2d390406a7ed0fed765d44d70 (patch) | |
| tree | d9c154f0f5ebe5311b74c128f4e17b4846eebbc4 /synapse/rest | |
| parent | Yield on EDU handling (diff) | |
| parent | Merge pull request #656 from matrix-org/erikj/get_event (diff) | |
| download | synapse-1660145a082470b2d390406a7ed0fed765d44d70.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/edu_yield
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v1/directory.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/directory.py b/synapse/rest/client/v1/directory.py index 60c5ec77aa..59a23d6cb6 100644 --- a/synapse/rest/client/v1/directory.py +++ b/synapse/rest/client/v1/directory.py @@ -127,8 +127,9 @@ class ClientDirectoryServer(ClientV1RestServlet): room_alias = RoomAlias.from_string(room_alias) yield dir_handler.delete_association( - user.to_string(), room_alias + requester, user.to_string(), room_alias ) + logger.info( "User %s deleted alias %s", user.to_string(), |