Merge pull request #20439 from gnufied/fix-m5-instance-limits

UPSTREAM: 66397: Fix upper limit on m5/c5 instance typesn
openshift · Aug 24, 2018 · 2846f0c · 2846f0c
2 parents dc2440c + addc8be
commit 2846f0c
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 16 deletions.
diff --git a/....io/kubernetes/pkg/scheduler/algorithm/predicates/max_attachable_volume_predicate_test.go b/....io/kubernetes/pkg/scheduler/algorithm/predicates/max_attachable_volume_predicate_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/algorithm/predicates/predicates.go b/vendor/k8s.io/kubernetes/pkg/scheduler/algorithm/predicates/predicates.go
diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/algorithm/predicates/predicates_test.go b/vendor/k8s.io/kubernetes/pkg/scheduler/algorithm/predicates/predicates_test.go