Google Git
Sign in
gerrit / gerrit / 57128499260be933741f61cd017c48ca44464e10
commit57128499260be933741f61cd017c48ca44464e10[log] [tgz]
authorEdwin Kempin <ekempin@google.com>Fri Oct 18 14:36:46 2019 +0200
committerEdwin Kempin <ekempin@google.com>Fri Oct 18 14:41:25 2019 +0200
tree9ba1f5a56ca7a5bdab2fa2a8656a5117e4a65ed1
parent3e9cc1af5033c958bf755098c2adc53618aad7f9 [diff]
MergeOp: Log IntegrationExceptions that are treated as conflict only as warning

We convert IntegrationExceptions into ResourceConflictExceptions. This
means for the caller this is a 409 Conflict and not an error. If it's
not an error we should not log it at severe level. For example such an
IntegrateException occurs if a change cannot be submitted because there
is a conflict with the destination branch.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I0ae5186fae346c71bad473092bb554e43c03515e
1 file changed
tree: 9ba1f5a56ca7a5bdab2fa2a8656a5117e4a65ed1
  1. .settings/
  2. antlr3/
  3. contrib/
  4. Documentation/
  5. e2e-tests/
  6. java/
  7. javatests/
  8. lib/
  9. modules/
  10. plugins/
  11. polygerrit-ui/
  12. prolog/
  13. prologtests/
  14. proto/
  15. resources/
  16. tools/
  17. webapp/
  18. .bazelignore
  19. .bazelproject
  20. .bazelrc
  21. .bazelversion
  22. .editorconfig
  23. .git-blame-ignore-revs
  24. .gitignore
  25. .gitmodules
  26. .gitreview
  27. .mailmap
  28. .pydevproject
  29. BUILD
  30. COPYING
  31. INSTALL
  32. package.json
  33. README.md
  34. SUBMITTING_PATCHES
  35. version.bzl
  36. WORKSPACE
README.md

Gerrit Code Review

Gerrit is a code review and project management tool for Git based projects.

Build Status

Objective

Gerrit makes reviews easier by showing changes in a side-by-side display, and allowing inline comments to be added by any reviewer.

Gerrit simplifies Git based project maintainership by permitting any authorized user to submit changes to the master Git repository, rather than requiring all approved changes to be merged in by hand by the project maintainer.

Documentation

For information about how to install and use Gerrit, refer to the documentation.

Source

Our canonical Git repository is located on googlesource.com. There is a mirror of the repository on Github.

Reporting bugs

Please report bugs on the issue tracker.

Contribute

Gerrit is the work of hundreds of contributors. We appreciate your help!

Please read the contribution guidelines.

Note that we do not accept Pull Requests via the Github mirror.

Getting in contact

The Developer Mailing list is repo-discuss on Google Groups.

License

Gerrit is provided under the Apache License 2.0.

Build

Install Bazel and run the following:

    git clone --recurse-submodules https://gerrit.googlesource.com/gerrit
    cd gerrit && bazel build release

Install binary packages (Deb/Rpm)

The instruction how to configure GerritForge/BinTray repositories is here

On Debian/Ubuntu run:

    apt-get update & apt-get install gerrit=<version>-<release>

NOTE: release is a counter that starts with 1 and indicates the number of packages that have been released with the same version of the software.

On CentOS/RedHat run:

    yum clean all && yum install gerrit-<version>[-<release>]

On Fedora run:

    dnf clean all && dnf install gerrit-<version>[-<release>]

Use pre-built Gerrit images on Docker

Docker images of Gerrit are available on DockerHub

To run a CentOS 7 based Gerrit image:

    docker run -p 8080:8080 gerritforge/gerrit-centos7[:version]

To run a Ubuntu 15.04 based Gerrit image:

    docker run -p 8080:8080 gerritforge/gerrit-ubuntu15.04[:version]

NOTE: release is optional. Last released package of the version is installed if the release number is omitted.