Merge branch 'develop' into shay/localpart_mig_2

synapse/storage/schema/__init__.py

@@ -107,6 +107,12 @@
 
 
 SCHEMA_COMPAT_VERSION = (
+    # Queries against `event_stream_ordering` columns in membership tables must
+    # be disambiguated.
+    #
+    # The threads_id column must written to with non-null values for the
+    # event_push_actions, event_push_actions_staging, and event_push_summary tables.
+    #
     # insertions to the column `full_user_id` of tables profiles and user_filters can no
     # longer be null
     75