summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-02-01 15:57:32 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-02-01 15:57:32 +0000
commitbcc78bb0b835ffc5217c216ac264d2726e01a98a (patch)
tree55e0fa2825f99bad2f1a8f3e8c8f254e3d713295
parentAddress changes (diff)
parent0.99.0rc4 (diff)
downloadsynapse-bcc78bb0b835ffc5217c216ac264d2726e01a98a.tar.xz
Merge branch 'release-v0.99.0' of github.com:matrix-org/synapse into anoa/acme_docs
-rw-r--r--CHANGES.md11
-rw-r--r--changelog.d/4539.misc1
-rw-r--r--changelog.d/4542.misc1
-rw-r--r--changelog.d/4544.misc1
-rw-r--r--synapse/__init__.py2
5 files changed, 12 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 458bbaf118..66991340a4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,14 @@
+Synapse 0.99.0rc4 (2019-02-01)
+==============================
+
+Internal Changes
+----------------
+
+- Update federation routing logic to check .well-known before SRV ([\#4539](https://github.com/matrix-org/synapse/issues/4539))
+- Improve performance of handling servers with invalid .well-known ([\#4542](https://github.com/matrix-org/synapse/issues/4542))
+- Treat an invalid .well-known file the same as an absent one ([\#4544](https://github.com/matrix-org/synapse/issues/4544))
+
+
 Synapse 0.99.0rc3 (2019-01-31)
 ==============================
 
diff --git a/changelog.d/4539.misc b/changelog.d/4539.misc
deleted file mode 100644
index b222c8d23f..0000000000
--- a/changelog.d/4539.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update federation routing logic to check .well-known before SRV
diff --git a/changelog.d/4542.misc b/changelog.d/4542.misc
deleted file mode 100644
index 74c84e0209..0000000000
--- a/changelog.d/4542.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve performance of handling servers with invalid .well-known
diff --git a/changelog.d/4544.misc b/changelog.d/4544.misc
deleted file mode 100644
index b29fc8575c..0000000000
--- a/changelog.d/4544.misc
+++ /dev/null
@@ -1 +0,0 @@
-Treat an invalid .well-known file the same as an absent one
\ No newline at end of file
diff --git a/synapse/__init__.py b/synapse/__init__.py
index e5f680bb31..54745af283 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.0rc3"
+__version__ = "0.99.0rc4"