Merge branch 'notifier_unify' into notifier_performance

This commit is contained in:
Mark Haines 2015-05-12 13:11:54 +01:00
commit 78672a9fd5
3 changed files with 28 additions and 24 deletions

View file

@ -316,7 +316,7 @@ class Notifier(object):
user, getattr(from_token, keyname), limit,
)
events.extend(stuff)
end_token = from_token.copy_and_replace(keyname, new_key)
end_token = end_token.copy_and_replace(keyname, new_key)
if events:
defer.returnValue((events, (from_token, end_token)))