opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  dev-contributing.txt: Update google-java-format version to 1.6
  ElasticVersionTest: Add assertions for already supported V6_5
  Document the --prefix option to ls-projects

Change-Id: I216e59caf288241fc38871992dd6433bae486cdc
This commit is contained in:
David Pursehouse 2019-01-31 16:35:30 +09:00
commit b6816bfd71
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/cmd-ls-projects.txt
View File

@ -14,6 +14,7 @@ _ssh_ -p <port> <host> _gerrit ls-projects_
[--format {text | json | json_compact}]
[--all]
[--limit <N>]
[--prefix | -p <prefix>]
[--has-acl-for GROUP]
--
@ -87,6 +88,9 @@ used to unescape the output.
--limit::
Cap the number of results to the first N matches.
--prefix::
Limit the results to those projects that start with the specified prefix.
--has-acl-for::
Display only projects on which access rights for this group are
directly assigned. Projects which only inherit access rights for

2
javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java
View File

@ -58,6 +58,7 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.V6_2.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V6_3.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V6_4.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V6_5.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V7_0.isV6OrLater()).isTrue();
}
@ -67,6 +68,7 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.V6_2.isV7OrLater()).isFalse();
assertThat(ElasticVersion.V6_3.isV7OrLater()).isFalse();
assertThat(ElasticVersion.V6_4.isV7OrLater()).isFalse();
assertThat(ElasticVersion.V6_5.isV7OrLater()).isFalse();
assertThat(ElasticVersion.V7_0.isV7OrLater()).isTrue();
}
}