Merge branch 'stable-3.1'

* stable-3.1:
  Improve documentation of plugins.mandatory config setting
  Test cherry-pick to a non-existing branch
  CherryPick: Do not fail with ISE if non-existing commit is specified as base
  dev-release: Update git tag command to avoid tagging jgit submodule

Change-Id: I232f0b3a6df5e3ea51f498a14e4d5e79a8d19158
This commit is contained in:
David Pursehouse
2019-10-18 21:08:26 +09:00
2 changed files with 5 additions and 2 deletions

View File

@@ -3644,7 +3644,10 @@ remotely, or disable existing plugins. Defaults to false.
[[plugins.mandatory]]plugins.mandatory::
+
List of mandatory plugins. If a plugin from this list does not load,
Gerrit start will fail.
Gerrit will fail to start.
+
Disabling and restarting of a mandatory plugin is rejected, but reloading
of a mandatory plugin is still possible.
[[plugins.jsLoadTimeout]]plugins.jsLoadTimeout::
+

View File

@@ -98,7 +98,7 @@ Commit the changes and create a signed release tag on the new commit:
Tag the plugins:
----
git submodule foreach git tag -s -m "v$version" "v$version"
git submodule foreach '[ "$path" == "modules/jgit" ] || git tag -s -m "v$version" "v$version"'
----
[[build-gerrit]]