Merge pull request #10028 from smarterclayton/init_container_quota

Merged by openshift-bot
openshift · Aug 2, 2016 · b729330 · b729330
2 parents 2dee2ff + ba33f9a
commit b729330
Show file tree

Hide file tree

Showing 4 changed files with 338 additions and 10 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/quota/evaluator/core/pods.go b/vendor/k8s.io/kubernetes/pkg/quota/evaluator/core/pods.go
diff --git a/vendor/k8s.io/kubernetes/pkg/quota/evaluator/core/pods_test.go b/vendor/k8s.io/kubernetes/pkg/quota/evaluator/core/pods_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/quota/resources.go b/vendor/k8s.io/kubernetes/pkg/quota/resources.go
diff --git a/vendor/k8s.io/kubernetes/pkg/quota/resources_test.go b/vendor/k8s.io/kubernetes/pkg/quota/resources_test.go