This job view page is being replaced by Spyglass soon. Check out the new job view.
PRfankangbest: support using dnsconfig defined in pod with highest priority
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2019-06-12 09:23
Elapsed0.00s
Revision
Refs 78690

No Test Failures!


Error lines from build-log.txt

# FAILED!
# Cloning kubernetes/kubernetes at master(56b40066d55d08308384b20dfbc292520cb1618a)
# Checking out pulls:
#	78690(f47b5eff77001dea6407850738668987c34ab2a3)
$ 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 607 lines ...
CONFLICT (content): Merge conflict in cmd/kubeadm/app/cmd/join.go
Auto-merging cmd/kubeadm/app/apis/kubeadm/validation/validation.go
CONFLICT (content): Merge conflict in cmd/kubeadm/app/apis/kubeadm/validation/validation.go
Auto-merging cmd/kube-proxy/app/server.go
CONFLICT (content): Merge conflict in cmd/kube-proxy/app/server.go
Auto-merging api/openapi-spec/swagger.json
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1