opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15'

Browse Source 
* stable-2.15:
  Update git submodules
  [GitwebServlet] Use logger built-in formatting
  [GitwebServlet] Avoid empty error flooding the logs
  MoveChangeIT: Test moving a change to a branch where label does not exist
  GerritPersonIdentProvider: Sanitize user.name and user.email values
  OutgoingEmail: Reduce visibility of methods
  OutgoingEmail: Remove unused public methods
  OutgoingEmail: Annotate methods with @Nullable
  OutgoingEmail#getUserNameEmailFor: Protect against null accountId
  OutgoingEmail#getNameEmailFor: Protect against null accountId
  OutgoingEmail#getName{Email}For: Use helpers from Account
  AbstractIndexTests: Add --wide option to show-queue command invocation
  AbstractIndexTests: Add assertions on change index count
  AbstractIndexTests: Use correct command to index project
  acceptance/SshSession: Add helper methods to assert about success/failure
  dev-bazel: Add 'elastic' and 'docker' to list of test groups
  dev-bazel: Improve section about running Elasticsearch tests
  AbstractIndexTests: Add coverage for index projects command
  ReadOnlyChangeIndex: Reduce visibility to package
  AbstractIndexTests: Refactor to simplify and use Java stream API
  Elasticsearch: Improve introduction in elasticsearch section
  Elasticsearch: Add support for version 6.3.0
  ElasticVersionTest: Add explicit test for 5.6.10
  ElasticContainer: Update to version 5.6.10

Due to incompatibility with methods in the Account class, the following
changes done on stable-2.14 are reverted in this merge. A different
solution to the potential null account Ids will need to be done for the
master branch:

  I383efdcd7 - OutgoingEmail: Annotate methods with @Nullable
  Ibb6994a5b - OutgoingEmail#getUserNameEmailFor: Protect against null accountId
  I8145ca79d - OutgoingEmail#getNameEmailFor: Protect against null accountId
  I9d55ec3f1 - OutgoingEmail#getName{Email}For: Use helpers from Account

This reverts commit 4fbf7ffb18.
This reverts commit aac761785b.
This reverts commit d75352f042.
This reverts commit ddf27f44c8.

Change-Id: I467d26843e44d02394f2b4cc86d0306ba836368b
This commit is contained in:
David Pursehouse
2018-06-20 23:46:37 +09:00
parent e37c20e4a3 f999c78fb7
commit ba366fb91b
25 changed files with 263 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/dev-bazel.txt
View File

@@ -266,7 +266,9 @@ The following values are currently supported for the group name:
* annotation
* api
* docker
* edit
* elastic
* git
* notedb
* pgm
@@ -277,11 +279,13 @@ The following values are currently supported for the group name:
[[elasticsearch]]
=== Elasticsearch
Successfully running the elasticsearch tests may require setting the local
Successfully running the Elasticsearch tests requires Docker, and
may require setting the local
link:https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html[virtual memory].
Bazel link:https://github.com/bazelbuild/bazel/issues/3476[does not currently make container failures visible],
if any.
If Docker is not available, the Elasticsearch tests will be skipped.
Note that Bazel currently does not show
link:https://github.com/bazelbuild/bazel/issues/3476[the skipped tests].
== Dependencies