summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-20 15:05:41 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-20 15:05:41 +0000
commit3505a2baac87cfc9bcdd218adcd123516d78df9f (patch)
tree713c0e401fe6c45b7791edbf262aa5cdaa442734
parentHacks to work around #6605 (#6608) (diff)
parent1.7.3 (diff)
downloadsynapse-3505a2baac87cfc9bcdd218adcd123516d78df9f.tar.xz
1.7.3
* commit '77661ce81':
  1.7.3
-rw-r--r--CHANGES.md11
-rw-r--r--changelog.d/6608.bugfix1
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
4 files changed, 18 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md

index d6567e24d2..361fd1fc6c 100644 --- a/CHANGES.md +++ b/CHANGES.md
@@ -1,3 +1,14 @@ +Synapse 1.7.3 (2019-12-31) +========================== + +This release fixes a long-standing bug in the state resolution algorithm. + +Bugfixes +-------- + +- Fix exceptions caused by state resolution choking on malformed events. ([\#6608](https://github.com/matrix-org/synapse/issues/6608)) + + Synapse 1.7.2 (2019-12-20) ========================== diff --git a/changelog.d/6608.bugfix b/changelog.d/6608.bugfix deleted file mode 100644
index 7768e0846e..0000000000 --- a/changelog.d/6608.bugfix +++ /dev/null
@@ -1 +0,0 @@ -Fix exceptions caused by state resolution choking on malformed events. diff --git a/debian/changelog b/debian/changelog
index 2492b5db92..31791c127c 100644 --- a/debian/changelog +++ b/debian/changelog
@@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.7.3) stable; urgency=medium + + * New synapse release 1.7.3. + + -- Synapse Packaging team <packages@matrix.org> Tue, 31 Dec 2019 10:45:04 +0000 + matrix-synapse-py3 (1.7.2) stable; urgency=medium * New synapse release 1.7.2. diff --git a/synapse/__init__.py b/synapse/__init__.py
index 996101cf09..71cb611820 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.7.2" +__version__ = "1.7.3" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when