opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  Update revision of commit-message-length-plugin
  Improve warning when starting Gerrit JVM without OOM protection
  Warning when starting Gerrit JVM without OOM protection
  cmd-index.txt: Fix anchors
  Update revision of commit-message-length-validator plugin

Change-Id: I22e63acf594457e15dc1f922641998a72a6f577a
This commit is contained in:
David Pursehouse 2018-08-30 10:20:15 +09:00
commit 60325b70b2
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/cmd-index.txt
View File

@ -18,12 +18,14 @@ To download a client command or hook, use scp or an http client:
For more details on how to determine the correct SSH port number, For more details on how to determine the correct SSH port number,
see link:user-upload.html#test_ssh[Testing Your SSH Connection]. see link:user-upload.html#test_ssh[Testing Your SSH Connection].
=== [[client_commands]]Commands [[client_commands]]
=== Commands
link:cmd-cherry-pick.html[gerrit-cherry-pick]:: link:cmd-cherry-pick.html[gerrit-cherry-pick]::
Download and cherry-pick one or more changes (commits). Download and cherry-pick one or more changes (commits).
=== [[client_hooks]]Hooks [[client_hooks]]
=== Hooks
Client hooks can be installed into a local Git repository, improving Client hooks can be installed into a local Git repository, improving
the developer experience when working with a Gerrit Code Review the developer experience when working with a Gerrit Code Review
@ -47,7 +49,8 @@ from an ssh client, for example:
For more details on how to determine the correct SSH port number, For more details on how to determine the correct SSH port number,
see link:user-upload.html#test_ssh[Testing Your SSH Connection]. see link:user-upload.html#test_ssh[Testing Your SSH Connection].
=== [[user_commands]]User Commands [[user_commands]]
=== User Commands
link:cmd-apropos.html[gerrit apropos]:: link:cmd-apropos.html[gerrit apropos]::
Search Gerrit documentation index. Search Gerrit documentation index.
@ -103,8 +106,8 @@ review. See link:user-upload.html#push_create[Creating Changes].
git upload-pack:: git upload-pack::
Standard Git server side command for client side `git fetch`. Standard Git server side command for client side `git fetch`.
[[admin_commands]]Administrator Commands [[admin_commands]]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ === Administrator Commands
link:cmd-close-connection.html[gerrit close-connection]:: link:cmd-close-connection.html[gerrit close-connection]::
Close the specified SSH connection. Close the specified SSH connection.

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

@ -443,6 +443,11 @@ case "$ACTION" in
echo -16 > "/proc/${PID}/oom_adj" echo -16 > "/proc/${PID}/oom_adj"
fi fi
fi fi
elif [ "$(uname -s)"=="Linux" ] && test -d "/proc/${PID}"; then
echo "WARNING: Could not adjust Gerrit's process for the kernel's out-of-memory killer."
echo " This may be caused by ${0} not being run as root."
echo " Consider changing the OOM score adjustment manually for Gerrit's PID=${PID} with e.g.:"
echo " echo '-1000' | sudo tee /proc/${PID}/oom_score_adj"
fi fi
TIMEOUT="$GERRIT_STARTUP_TIMEOUT" TIMEOUT="$GERRIT_STARTUP_TIMEOUT"

2
plugins/commit-message-length-validator

@ -1 +1 @@
Subproject commit 3f96a82f15d9d592a86a989874b160567cd66f53 Subproject commit 4f6b685e12e34a4f583cf84ba1c58ccc2b75e8b0