Merge pull request #12172 from kargakis/cherry-pick-for-1.3

[1.3] UPSTREAM: 38196: fix mesos unit tests
openshift · Dec 7, 2016 · ac1d579 · ac1d579
2 parents 14778b7 + 6806ce9
commit ac1d579
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