github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-26 04:36:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15138 from mattmoor/limited-beta-rewrite

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-10 11:41:34 -07:00
parent 3bd7aafcd2 eeb4eeb17c
commit 8580804f77
13 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/pods.go
View File

@@ -147,7 +147,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "test",
Image: "gcr.io/google_containers/pause",
Image: "beta.gcr.io/google_containers/pause:2.0",
},
},
},
@@ -172,7 +172,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "nginx",
Image: "gcr.io/google_containers/pause",
Image: "beta.gcr.io/google_containers/pause:2.0",
Resources: api.ResourceRequirements{
Limits: api.ResourceList{
api.ResourceCPU: *resource.NewMilliQuantity(100, resource.DecimalSI),