PR | justinsb: Support apiserver-only nodes on GCE |
Result | FAILURE |
Tests | 0 failed / 0 succeeded |
Started | |
Elapsed | 0.00s |
Revision | |
Refs |
12738 |
Environment setup # Final SHA: # Total runtime: 0s # FAILED # Cloning kubernetes/kops at master(b899bf644048958f1c2b9a25931f09fb463e713d) # Checking out pulls: # 12738(80e93e533dc5cc09346a7a4729066507ae73c6fd) $ PWD=/ mkdir -p /home/prow/go/src/k8s.io/kops (runtime: 2.006637ms) $ PWD=/home/prow/go/src/k8s.io/kops git init (runtime: 6.757706ms) hint: Using 'master' as the name for the initial branch. This default branch name ... skipping 246 lines ... CONFLICT (content): Merge conflict in upup/pkg/fi/cloudup/populate_instancegroup_spec.go Auto-merging pkg/model/gcemodel/autoscalinggroup.go Auto-merging pkg/apis/kops/validation/instancegroup.go CONFLICT (content): Merge conflict in pkg/apis/kops/validation/instancegroup.go warning: inexact rename detection was skipped due to too many files. warning: you may want to set your merge.renamelimit variable to at least 3770 and retry the command. Automatic merge failed; fix conflicts and then commit the result. # Error: exit status 1 # Final SHA: # Total runtime: 0s