opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  mvn.py: Explicitly specify version in mvn deploy command
  Add missing 'Allow content merges' section title in project config documentation
  Allow to disable log file compression
  Allow to disable log file rotation
  SystemLog: Don't keep Config as a member
  AccountIT#deletePreferredEmail: Fix flakiness

Change-Id: Icd25df65e0cfb1ffe624fd1e7e095ecf887e444e
This commit is contained in:
David Pursehouse 2019-06-04 21:20:47 +09:00
commit 2be2df6581
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/project-configuration.txt
View File

@ -137,6 +137,8 @@ Thus, Rebase Always can be considered similar to Cherry Pick, but with
the important distinction that Rebase Always does not ignore dependencies.
[[content_merge]]
=== Allow content merges
If `Allow content merges` is enabled, Gerrit will try
to do a content merge when a path conflict occurs.

2
javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
View File

@ -1063,7 +1063,7 @@ public class AccountIT extends AbstractDaemonTest {
@Test
public void deletePreferredEmail() throws Exception {
String email = "foo.bar@example.com";
String email = "foo.bar.baz@example.com";
EmailInput input = new EmailInput();
input.email = email;
input.noConfirmation = true;

1
tools/maven/mvn.py
View File

@ -46,6 +46,7 @@ elif 'deploy' == args.a:
cmd = [
'mvn',
'gpg:sign-and-deploy-file',
'-Dversion=%s' % args.v,
'-DrepositoryId=%s' % args.repository,
'-Durl=%s' % args.url,
]