Merge pull request #13736 from socaa/dockerfile-memory

Auto commit by PR queue bot

Merge pull request #13736 from socaa/dockerfile-memory
db128ac0 · k8s-merge-robot · 1f97fbea · 44e1d550 · db128ac0
Commit db128ac0 authored Sep 14, 2015 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Dockerfile test/images/resource-consumer/Dockerfile +1 -1

No files found.
--- a/test/images/resource-consumer/Dockerfile
+++ b/test/images/resource-consumer/Dockerfile
-FROM scratch
+FROM jess/stress
 MAINTAINER Ewa Socala <socaa@google.com>
 ADD consumer /consumer
 ADD consume-cpu /consume-cpu