Merge branch 'stable-2.10'

* stable-2.10:
  Update 2.10 release notes
  Update JGit to 3.5.3.201412180710-r
  Release notes for Gerrit 2.9.4
  Set version to 2.9.4
  Update JGit to 3.4.2.201412180340-r

Conflicts:
	lib/jgit/BUCK

Change-Id: I174c722d5004ab507fdfc402de0a65f5057583a3
This commit is contained in:
David Pursehouse 2015-01-06 09:48:00 +09:00
commit e28df055ce
3 changed files with 39 additions and 3 deletions

@ -8,8 +8,10 @@ link:https://gerrit-releases.storage.googleapis.com/gerrit-2.10.war[
https://gerrit-releases.storage.googleapis.com/gerrit-2.10.war]
Gerrit 2.10 includes the bug fixes done with
link:ReleaseNotes-2.9.1.html[Gerrit 2.9.1] and
link:ReleaseNotes-2.9.2.html[Gerrit 2.9.2].
link:ReleaseNotes-2.9.1.html[Gerrit 2.9.1],
link:ReleaseNotes-2.9.2.html[Gerrit 2.9.2],
link:ReleaseNotes-2.9.3.html[Gerrit 2.9.3] and
link:ReleaseNotes-2.9.4.html[Gerrit 2.9.4].
These bug fixes are *not* listed in these release notes.
Important Notes
@ -677,7 +679,7 @@ Upgrades
* Update Jetty to 9.2
* Update JGit to 3.4.0.201406110918-r
* Update JGit to 3.5.3.201412180710-r
* Update log4j to 1.2.17

@ -0,0 +1,33 @@
Release notes for Gerrit 2.9.4
==============================
Download:
link:https://gerrit-releases.storage.googleapis.com/gerrit-2.9.4.war[
https://gerrit-releases.storage.googleapis.com/gerrit-2.9.4.war]
Important Notes
---------------
*WARNING:* There are no schema changes from
link:ReleaseNotes-2.9.3.html[2.9.3], but when upgrading from an existing site
that was initialized with Gerrit version 2.6 to version 2.9.1 the primary key
column order will be updated for some tables. It is therefore important to
upgrade the site with the `init` program, rather than only copying the .war file
over the existing one.
It is recommended to run the `init` program in interactive mode. Warnings will
be suppressed in batch mode.
----
java -jar gerrit.war init -d site_path
----
Bug Fixes
---------
* Update JGit to 3.4.2.201412180340-r
+
This JGit version mitigates
link:http://article.gmane.org/gmane.linux.kernel/1853266[CVE-2014-9390]. See the
link:https://projects.eclipse.org/projects/technology.jgit/releases/3.4.2[JGit release notes]
for further details.

@ -14,6 +14,7 @@ Version 2.10.x
[[2_9]]
Version 2.9.x
-------------
* link:ReleaseNotes-2.9.4.html[2.9.4]
* link:ReleaseNotes-2.9.3.html[2.9.3]
* link:ReleaseNotes-2.9.2.html[2.9.2]
* link:ReleaseNotes-2.9.1.html[2.9.1]