PRlavalamp: [DO NOT MERGE] This PR is to let us test the feature-serverside-apply branch
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2019-01-11 17:26
Elapsed0.00s
Revision

No Test Failures!


Error lines from build-log.txt

# FAILED!
# Cloning kubernetes/kubernetes at master(d2d9a3aba471e56e1a753a05061dc6cb60137711)
# Checking out pulls:
#	62554(eef827079fe1a08a9425972b66ad3e0560843986)
$ 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 535 lines ...
Removing pkg/kubectl/apply/parse/list_element.go
Removing pkg/kubectl/apply/parse/item.go
Removing pkg/kubectl/apply/parse/factory.go
Removing pkg/kubectl/apply/parse/BUILD
Removing pkg/kubectl/apply/map_element.go
Removing pkg/kubectl/apply/list_element.go
Removing pkg/kubectl/apply/error.go
Removing pkg/kubectl/apply/empty_element.go
Removing pkg/kubectl/apply/element.go
Removing pkg/kubectl/apply/doc.go
Auto-merging pkg/features/kube_features.go
Auto-merging pkg/api/pod/util_test.go
Auto-merging Godeps/LICENSES
CONFLICT (content): Merge conflict in Godeps/LICENSES
Auto-merging Godeps/Godeps.json
CONFLICT (content): Merge conflict in Godeps/Godeps.json
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1