Merge pull request #22608 from fejta/redis

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-06 17:32:20 -08:00
commit fea6b0d50c
3 changed files with 3 additions and 3 deletions

View File

@ -165,7 +165,7 @@ spec:
spec: spec:
containers: containers:
- name: master - name: master
image: redis image: gcr.io/google_containers/redis:e2e # or just image: redis
resources: resources:
requests: requests:
cpu: 100m cpu: 100m

View File

@ -45,7 +45,7 @@ spec:
spec: spec:
containers: containers:
- name: master - name: master
image: redis image: gcr.io/google_containers/redis:e2e # or just image: redis
resources: resources:
requests: requests:
cpu: 100m cpu: 100m

View File

@ -27,7 +27,7 @@ spec:
spec: spec:
containers: containers:
- name: master - name: master
image: redis image: gcr.io/google_containers/redis:e2e # or just image: redis
resources: resources:
requests: requests:
cpu: 100m cpu: 100m