tree 90ef56b83d1f81d97f57ad41796b638172ab6be3
parent b7b1472a5a201dbe2f997e610afdbdbcbebaff16
parent 9790275c127d033c4900df7e9444601f915476d1
author David Pursehouse <dpursehouse@collab.net> 1572565608 +0900
committer David Pursehouse <dpursehouse@collab.net> 1572565608 +0900

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Post/Delete GPG keys: Do not return 409 Conflict if an error occurred
  DeleteRef: Do not return 409 Conflict if an error occurred
  DeleteRef: Do not log an error if user attempted to delete the current branch
  Init: Increase severity log level to error on exceptions
  Bazel: Fix genrule2 to clean up temporary folder content
  AbstractIndexTests: Inline constant assertChangeQuery string parameter
  AbstractIndexTests: Align assertChangeQuery method access with its use
  AbstractIndexTests: Provide default configureIndex method implementation
  XContentBuilder: Use JsonFactory.builder() and new feature enums

Change-Id: Id3499febf123f2f3aa872d589b5df478d1d66b63