opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.9'

Browse Source 
* stable-2.9:
  Set version to 2.9
  Mention 2.8.6.1 in 2.9 release notes
  gerrit.sh: change "1.6" to "1.7"

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

Change-Id: I882339164719c2bf440e89ec81477213fa52b2b5
This commit is contained in:
David Pursehouse 2014-07-10 16:31:42 +09:00
commit 463f681f6a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ReleaseNotes/ReleaseNotes-2.9.txt
View File

@ -15,8 +15,9 @@ link:ReleaseNotes-2.8.1.html[Gerrit 2.8.1],
link:ReleaseNotes-2.8.2.html[Gerrit 2.8.2],
link:ReleaseNotes-2.8.3.html[Gerrit 2.8.3],
link:ReleaseNotes-2.8.4.html[Gerrit 2.8.4],
link:ReleaseNotes-2.8.5.html[Gerrit 2.8.5], and
link:ReleaseNotes-2.8.6.html[Gerrit 2.8.6].
link:ReleaseNotes-2.8.5.html[Gerrit 2.8.5],
link:ReleaseNotes-2.8.6.html[Gerrit 2.8.6] and
link:ReleaseNotes-2.8.6.1.html[Gerrit 2.8.6.1].
These bug fixes are *not* listed in these release notes.
Schema Change

2
gerrit-pgm/src/main/resources/com/google/gerrit/pgm/gerrit.sh
View File

@ -254,7 +254,7 @@ fi
if test -z "$JAVA" ; then
echo >&2 "Cannot find a JRE or JDK. Please set JAVA_HOME or"
echo >&2 "container.javaHome in $GERRIT_SITE/etc/gerrit.config"
echo >&2 "to a >=1.6 JRE"
echo >&2 "to a >=1.7 JRE"
exit 1
fi