opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  gerrit.sh: Fix message about JRE
  Allow CommitValidationListener to ignore 'skip validation' push option

The change "Allow CommitValidationListener to ignore 'skip validation'
push option" is omitted from this merge as it requires non-trivial fixes
to make it work on stable-2.16. It will be re-done separately in a follow
up commit, to make it easier to review.

Change-Id: I2930c972c3db4eaae6a025a43753145d8aad94ba
This commit is contained in:
David Pursehouse
2019-06-21 09:51:20 +09:00
parent 5f4e92627b 76b5edf535
commit 09ed5b778f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/com/google/gerrit/pgm/init/gerrit.sh
View File

@@ -265,7 +265,7 @@ fi
if test -z "$JAVA" ; then
echo >&2 "Cannot find a JRE or JDK. Please ensure that the JAVA_HOME environment"
echo >&2 "variable or container.javaHome in $GERRIT_SITE/etc/gerrit.config is"
echo >&2 "set to a valid >=1.7 JRE location"
echo >&2 "set to a valid >=1.8 JRE location"
exit 1
fi