Merge branch 'stable-2.9' into stable-2.10 * stable-2.9: Release notes for Gerrit 2.9.4 Set version to 2.9.4 Update JGit to 3.4.2.201412180340-r Conflicts: VERSION gerrit-extension-api/pom.xml gerrit-plugin-api/pom.xml gerrit-plugin-archetype/pom.xml gerrit-plugin-gwt-archetype/pom.xml gerrit-plugin-gwtui/pom.xml gerrit-plugin-js-archetype/pom.xml gerrit-war/pom.xml lib/jgit/BUCK Change-Id: Ic626d7076156ffcc714266e3c17cdc80fcb62ad9
diff --git a/ReleaseNotes/ReleaseNotes-2.9.4.txt b/ReleaseNotes/ReleaseNotes-2.9.4.txt new file mode 100644 index 0000000..38bf9c6 --- /dev/null +++ b/ReleaseNotes/ReleaseNotes-2.9.4.txt
@@ -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.
diff --git a/ReleaseNotes/index.txt b/ReleaseNotes/index.txt index c3b0a4d..c7aab32 100644 --- a/ReleaseNotes/index.txt +++ b/ReleaseNotes/index.txt
@@ -9,6 +9,7 @@ [[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]