This job view page is being replaced by Spyglass soon. Check out the new job view.
PRplsmaop: fix comment
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2020-01-19 13:57
Elapsed0.00s
Revision
Refs 85053

No Test Failures!


Error lines from build-log.txt

# FAILED!
# Cloning kubernetes/kubernetes at master(073da1588a9ec79d673f3356734e22756f06c05e)
# Checking out pulls:
#	85053(b301e081ca7a7ef1e885d7266bbc48442f6dcce8)
$ mkdir -p /home/prow/go/src/k8s.io/kubernetes
$ git init
Initialized empty Git repository in /home/prow/go/src/k8s.io/kubernetes/.git/
... skipping 933 lines ...
CONFLICT (modify/delete): pkg/scheduler/algorithm/priorities/BUILD deleted in HEAD and modified in b301e081ca7a7ef1e885d7266bbc48442f6dcce8. Version b301e081ca7a7ef1e885d7266bbc48442f6dcce8 of pkg/scheduler/algorithm/priorities/BUILD left in tree.
Auto-merging pkg/scheduler/algorithm/predicates/predicates_test.go
CONFLICT (content): Merge conflict in pkg/scheduler/algorithm/predicates/predicates_test.go
Auto-merging pkg/scheduler/algorithm/predicates/predicates.go
CONFLICT (content): Merge conflict in pkg/scheduler/algorithm/predicates/predicates.go
CONFLICT (modify/delete): pkg/scheduler/algorithm/predicates/metadata.go deleted in HEAD and modified in b301e081ca7a7ef1e885d7266bbc48442f6dcce8. Version b301e081ca7a7ef1e885d7266bbc48442f6dcce8 of pkg/scheduler/algorithm/predicates/metadata.go left in tree.
CONFLICT (modify/delete): pkg/scheduler/algorithm/predicates/error.go deleted in HEAD and modified in b301e081ca7a7ef1e885d7266bbc48442f6dcce8. Version b301e081ca7a7ef1e885d7266bbc48442f6dcce8 of pkg/scheduler/algorithm/predicates/error.go left in tree.
Auto-merging pkg/scheduler/BUILD
CONFLICT (content): Merge conflict in pkg/scheduler/BUILD
Auto-merging pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/v1alpha1Tov1alpha1/empty.yaml.after_roundtrip
CONFLICT (add/add): Merge conflict in pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/v1alpha1Tov1alpha1/empty.yaml.after_roundtrip
Auto-merging pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/v1alpha1To__internal/empty.yaml.after_roundtrip
CONFLICT (add/add): Merge conflict in pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/v1alpha1To__internal/empty.yaml.after_roundtrip
... skipping 46 lines ...
Auto-merging CHANGELOG-1.17.md
CONFLICT (content): Merge conflict in CHANGELOG-1.17.md
Auto-merging CHANGELOG-1.16.md
CONFLICT (content): Merge conflict in CHANGELOG-1.16.md
Auto-merging CHANGELOG-1.15.md
CONFLICT (content): Merge conflict in CHANGELOG-1.15.md
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1