| commit | 3056711183ad19fa2a54fbd6c9d93be807b71904 | [log] [tgz] |
|---|---|---|
| author | Luca Milanesio <luca.milanesio@gmail.com> | Tue Oct 30 16:17:34 2018 +0000 |
| committer | Luca Milanesio <luca.milanesio@gmail.com> | Tue Oct 30 16:17:34 2018 +0000 |
| tree | 067594f45ebe762fa21921bc5db377a4f1370c5a | |
| parent | 6c0cc337f86577226f75f52fe4445996720fe913 [diff] | |
| parent | b80907369fd825a0b0f6e7fee5528d730b81cdb6 [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Allow OWNERS file with single owner Revert "Fix label name generated by workskace-status.sh" Change-Id: Ic7634bbfd5a0770caf714bcb3474a6051cc0c363
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 2b8ecc9..17f75d0 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,6 +80,9 @@ } private static Stream<String> extractOwners(JsonNode node) { + if(node.isTextual()) { + return Stream.of(node.asText()); + } return iteratorStream(node.iterator()).map(JsonNode::asText); }
diff --git a/tools/workspace-status.sh b/tools/workspace-status.sh index 83f9cdc..35966f1 100755 --- a/tools/workspace-status.sh +++ b/tools/workspace-status.sh
@@ -14,4 +14,4 @@ cd $1; git describe --always --match "v[0-9].*" --dirty } -echo STABLE_BUILD_OWNERS_LABEL $(rev .) +echo STABLE_BUILD_OWNERS-AUTOASSIGN_LABEL $(rev .)