opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.5' into stable-2.6

Browse Source 
* 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
This commit is contained in:
Shawn Pearce
2013-05-18 13:08:10 -07:00
parent d7d8b620ce 98100202d5
commit cd4f464a08
5 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReleaseNotes/index.txt
View File

@@ -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]