PR | claudiubelu: Replaces path.Operation with filepath.Operation |
Result | FAILURE |
Tests | 0 failed / 0 succeeded |
Started | |
Elapsed | 0.00s |
Revision | |
Refs |
110601 |
Environment setup # FAILED # Cloning kubernetes/kubernetes at master(b1e2af45e4ff126fcbcffa2e66ed36502103be7b) # Checking out pulls: # 110601(609b200ebe1939ed5b66c050c20e62a58533cc98) $ PWD=/ mkdir -p /home/prow/go/src/k8s.io/kubernetes $ PWD=/home/prow/go/src/k8s.io/kubernetes git init hint: Using 'master' as the name for the initial branch. This default branch name ... skipping 972 lines ... Auto-merging pkg/kubelet/kubelet.go Auto-merging pkg/kubelet/cri/streaming/server.go Auto-merging pkg/kubelet/cm/pod_container_manager_linux.go CONFLICT (content): Merge conflict in pkg/kubelet/cm/pod_container_manager_linux.go Auto-merging cmd/kubeadm/app/constants/constants.go Auto-merging cmd/kube-apiserver/app/testing/testserver.go Automatic merge failed; fix conflicts and then commit the result. # Error: exit status 1