summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorDan Callahan <danc@element.io>2021-06-08 11:44:50 +0100
committerGitHub <noreply@github.com>2021-06-08 11:44:50 +0100
commit7dc14730d925a39a885a14ce309d99054f9617d5 (patch)
tree245c19599fdae8a9e832c3f88e92f8cb8a2d58da /changelog.d
parentWhen joining a remote room limit the number of events we concurrently check s... (diff)
downloadsynapse-7dc14730d925a39a885a14ce309d99054f9617d5.tar.xz
Name release branches just after major.minor (#10013)
With the prior format, 1.33.0 / 1.33.1 / 1.33.2 got separate branches:

    release-v1.33.0
    release-v1.33.1
    release-v1.33.2

Under the new model, all three would share a common branch:

    release-v1.33

As before, RCs and actual releases exist as tags on these branches.

This better reflects our support model, e.g., that the "1.33" series had
a formal release followed by two patches / updates.

Signed-off-by: Dan Callahan <danc@element.io>
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/10013.misc1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/10013.misc b/changelog.d/10013.misc
new file mode 100644
index 0000000000..9d164d9ce2
--- /dev/null
+++ b/changelog.d/10013.misc
@@ -0,0 +1 @@
+Simplify naming convention for release branches to only include the major and minor version numbers.