Merge pull request #14669 from gnufied/fix-get-instances-by-node-names

Merged by openshift-bot
openshift · Jun 16, 2017 · 517be84 · 517be84
2 parents 5891474 + 1e38694
commit 517be84
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 14 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/aws.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/aws.go
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/aws_test.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/aws_test.go