Merge pull request #12165 from kargakis/cherry-pick-upstream-38196

UPSTREAM: 38196: fix mesos unit tests
openshift · Dec 7, 2016 · 5c6a1d4 · 5c6a1d4
2 parents 4705adc + 74f64a7
commit 5c6a1d4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/mesos/client_test.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/mesos/client_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/mesos/mesos_test.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/mesos/mesos_test.go