summaryrefslogtreecommitdiffstats
path: root/ReleaseNotes
diff options
context:
space:
mode:
authorShawn Pearce <sop@google.com>2013-05-18 13:08:10 -0700
committerShawn Pearce <sop@google.com>2013-05-18 13:08:10 -0700
commitcd4f464a087a8710365a8aae8f147bc8d1339324 (patch)
treec149ba9ac100b9d3ddafbf09d8be93167da143d9 /ReleaseNotes
parentd7d8b620ce8e5c06dd3ba3833ddd44179b436116 (diff)
parent98100202d5fdf2be8edbbdd99b19392ebac508f2 (diff)
Merge branch 'stable-2.5' into stable-2.6
* stable-2.5: Release notes for 2.5.4 Require preferred email to be a verified address Corrections in the 2.5.x release notes Conflicts: ReleaseNotes/ReleaseNotes-2.5.2.txt gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountSecurityImpl.java Change-Id: I08731949f0e7a87604ca003b81e6dbe63678bd82
Diffstat (limited to 'ReleaseNotes')
-rw-r--r--ReleaseNotes/ReleaseNotes-2.5.1.txt2
-rw-r--r--ReleaseNotes/ReleaseNotes-2.5.3.txt4
-rw-r--r--ReleaseNotes/ReleaseNotes-2.5.4.txt22
-rw-r--r--ReleaseNotes/index.txt1
4 files changed, 26 insertions, 3 deletions
diff --git a/ReleaseNotes/ReleaseNotes-2.5.1.txt b/ReleaseNotes/ReleaseNotes-2.5.1.txt
index 3a640d1252..6fc0dc57de 100644
--- a/ReleaseNotes/ReleaseNotes-2.5.1.txt
+++ b/ReleaseNotes/ReleaseNotes-2.5.1.txt
@@ -7,7 +7,7 @@ link:http://code.google.com/p/gerrit/downloads/detail?name=gerrit-full-2.5.1.war
There are no schema changes from 2.5, or 2.5.1.
-However, if upgrading from anything earlier version, follow the upgrade
+However, if upgrading from a version older than 2.5, follow the upgrade
procedure in the 2.5 link:ReleaseNotes-2.5.html[Release Notes].
Security Fixes
diff --git a/ReleaseNotes/ReleaseNotes-2.5.3.txt b/ReleaseNotes/ReleaseNotes-2.5.3.txt
index 1cbe85f514..60efa7a3a1 100644
--- a/ReleaseNotes/ReleaseNotes-2.5.3.txt
+++ b/ReleaseNotes/ReleaseNotes-2.5.3.txt
@@ -5,9 +5,9 @@ Gerrit 2.5.3 is now available:
link:http://code.google.com/p/gerrit/downloads/detail?name=gerrit-2.5.3.war[http://code.google.com/p/gerrit/downloads/detail?name=gerrit-2.5.3.war]
-There are no schema changes from any member of the 2.5.x versions.
+There are no schema changes from any of the 2.5.x versions.
-However, if upgrading from anything earlier version, follow the upgrade
+However, if upgrading from a version older than 2.5, follow the upgrade
procedure in the 2.5 link:ReleaseNotes-2.5.html[Release Notes].
Security Fixes
diff --git a/ReleaseNotes/ReleaseNotes-2.5.4.txt b/ReleaseNotes/ReleaseNotes-2.5.4.txt
new file mode 100644
index 0000000000..1657d9b4fc
--- /dev/null
+++ b/ReleaseNotes/ReleaseNotes-2.5.4.txt
@@ -0,0 +1,22 @@
+Release notes for Gerrit 2.5.4
+==============================
+
+Gerrit 2.5.4 is now available:
+
+link:http://code.google.com/p/gerrit/downloads/detail?name=gerrit-2.5.4.war[http://code.google.com/p/gerrit/downloads/detail?name=gerrit-2.5.4.war]
+
+There are no schema changes from any of the 2.5.x versions.
+
+However, if upgrading from a version older than 2.5, follow the upgrade
+procedure in the 2.5 link:ReleaseNotes-2.5.html[Release Notes].
+
+Bug Fixes
+---------
+* Require preferred email to be verified
++
+Some users were able to select a preferred email address that was
+not previously verified. This may have allowed the server to send
+notifications to an invalid destination, resulting in higher than
+usual bounce rates.
+
+No other changes since 2.5.3.
diff --git a/ReleaseNotes/index.txt b/ReleaseNotes/index.txt
index 54791012e5..98cc3ac51d 100644
--- a/ReleaseNotes/index.txt
+++ b/ReleaseNotes/index.txt
@@ -9,6 +9,7 @@ Version 2.6.x
[[2_5]]
Version 2.5.x
-------------
+* link:ReleaseNotes-2.5.4.html[2.5.4]
* link:ReleaseNotes-2.5.3.html[2.5.3]
* link:ReleaseNotes-2.5.2.html[2.5.2]
* link:ReleaseNotes-2.5.1.html[2.5.1]