Merge branch 'stable-3.3' into master

* stable-3.3: (33 commits)
  Update git submodules
  Update git submodules
  Add z-index to gr-main-header
  Compact the REST-API output JSON unconditionally
  Remove requesting DETAILED_LABELS for the dashboard
  Update git submodules
  Honor toogleWipState permission for %ready %wip push options
  Update JGit to 9a1065afe
  Update JGit to 8f422e9a9
  Update JGit to c9d871f15
  Update JGit to 5.3.9.202012012026-r
  Update JGit to 5.1.15.202012011955-r
  Set version to 3.3.1-SNAPSHOT
  Set version to 3.3.0
  Auto-enable git wire protocol v2 in jgit
  Fix NPE with StoredCommentLinkInfoSerializer when enabled is null
  Auto-disable auto gc in jgit
  Bump up jetty version to 9.4.33.v20201020
  Update zero-downtime documentation in config-gerrit.txt
  Improve message if submit fails due to non-fulfilled submit requirements
  Upgrade JGit to d1801402
  Upgrade JGit to ad902087
  Upgrade JGit to 5cd485e5
  Upgrade JGit to 5.3.8.202011260953-r
  Include repo config into CommitReceivedEvent
  MergeValidationListener: Also provide RevWalk to the onPreMerge method
  Add fatal to consistency and validation error enums
  Upgrade JGit to 5.1.14.202011251942-r
  Fix flaky test for group renaming in ProjectConfig
  ProjectConfig: Write resolved groups to file
  Fix bazel run_shell usage for newer versions
  Use strict equality
  Add a warning if submitting a change with an open change edit

Change-Id: I87c8a326f41fd9622034206fa512548380dc666a
This commit is contained in:
Sven Selberg
2020-12-08 15:00:55 +01:00
committed by Sven Selberg
13 changed files with 237 additions and 37 deletions

View File

@@ -2336,8 +2336,8 @@ Defaults to the full hostname of the Gerrit server.
[[gerrit.experimentalRollingUpgrade]]gerrit.experimentalRollingUpgrade::
+
Enable Gerrit rolling upgrade to the next version.
For example if Gerrit v3.1 is version N (All-Projects:refs/meta/version=181)
then its next version N+1 is v3.2 (All-Projects:refs/meta/version=183).
For example if Gerrit v3.2 is version N (All-Projects:refs/meta/version=183)
then its next version N+1 is v3.3 (All-Projects:refs/meta/version=184).
Allow Gerrit to start even if the underlying schema version has been bumped to
the next Gerrit version.
+
@@ -2354,7 +2354,7 @@ of the following steps:
1. Set gerrit.experimentalRollingUpgrade to true on all Gerrit masters
2. Set the first master unhealthy
3. Shutdown the first master and [upgrade](install.html#init) to the next version
4. Startup the first master, wait for the online reindex to complete
4. Startup the first master, wait for the online reindex to complete (where applicable)
5. Verify the the first master upgrade is successful and online reindex is complete
6. Set the first master healthy
7. Repeat steps 2. to 6. for all the other Gerrit nodes
@@ -5625,10 +5625,12 @@ Supported versions:
[[receive.autogc]]receive.autogc::
+
By default, `git-receive-pack` will run auto gc after receiving data from git-push and updating refs.
By default, up to Gerrit 3.2 `git-receive-pack` will run auto gc after receiving data from git-push and updating refs.
You can stop it by setting this variable to `false`. This is recommended in gerrit to avoid the
additional load this creates. Instead schedule gc using link:cmd-gc.html#gc.startTime[gc.startTime]
and link:cmd-gc.html#gc.interval[gc.interval] or e.g. in a cron job that runs gc in a separate process.
Since Gerrit 3.3 the init command will auto-configure `git-receive-pack = false` in `etc/jgit.config` if
it wasn't set manually and show a warning if it was set to `true` manually.
GERRIT
------