| commit | 97cb64cd70ab4dd2c68149f4d0971b35f946fa1d | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Fri Nov 02 11:37:59 2018 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Fri Nov 02 11:37:59 2018 +0900 |
| tree | c1c0580b7ddd4cac63f7834f5a8f6ac7bfb5da62 | |
| parent | e89351c3691756a01c9aa33cf7e3a3ef65d8378e [diff] | |
| parent | b60a6377b137ea5733bb8a9f6e1de05701ec4224 [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Add "Empty file" comments in empty BUILD files ConfigurationParser: Format with google-java-format Change-Id: I1bac29b1b21b6dda7a23639170256144d03306f2
diff --git a/owners-common/src/main/java/com/vmware/gerrit/owners/common/ConfigurationParser.java b/owners-common/src/main/java/com/vmware/gerrit/owners/common/ConfigurationParser.java index 17f75d0..48b7bc3 100644 --- a/owners-common/src/main/java/com/vmware/gerrit/owners/common/ConfigurationParser.java +++ b/owners-common/src/main/java/com/vmware/gerrit/owners/common/ConfigurationParser.java
@@ -80,7 +80,7 @@ } private static Stream<String> extractOwners(JsonNode node) { - if(node.isTextual()) { + if (node.isTextual()) { return Stream.of(node.asText()); } return iteratorStream(node.iterator()).map(JsonNode::asText);
diff --git a/tools/BUILD b/tools/BUILD index e69de29..c5ed0b7 100644 --- a/tools/BUILD +++ b/tools/BUILD
@@ -0,0 +1 @@ +# Empty file required by Bazel