diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-07-25 17:27:49 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-07-25 17:27:49 +0100 |
| commit | 2565804030b14eab5f1455e8a860c1fbd71d45fc (patch) | |
| tree | 7cdac37c0d7a0611b54f32312fdf5028c0c91b44 /synapse/events | |
| parent | flake8 (diff) | |
| parent | Merge pull request #3603 from matrix-org/erikj/handle_outliers (diff) | |
| download | synapse-2565804030b14eab5f1455e8a860c1fbd71d45fc.tar.xz | |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/events')
| -rw-r--r-- | synapse/events/snapshot.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py index 189212b0fa..368b5f6ae4 100644 --- a/synapse/events/snapshot.py +++ b/synapse/events/snapshot.py @@ -249,7 +249,7 @@ class EventContext(object): @defer.inlineCallbacks def update_state(self, state_group, prev_state_ids, current_state_ids, - delta_ids): + prev_group, delta_ids): """Replace the state in the context """ @@ -260,6 +260,7 @@ class EventContext(object): self.state_group = state_group self._prev_state_ids = prev_state_ids + self.prev_group = prev_group self._current_state_ids = current_state_ids self.delta_ids = delta_ids |