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 #21610 from fejta/e2etag

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-26 12:52:43 -08:00
parent a53bf86f40 3d8913a43a
commit 192119c2ac
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/pods.go
View File

@@ -701,7 +701,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "liveness",
Image: "gcr.io/google_containers/liveness",
Image: "gcr.io/google_containers/liveness:e2e",
Command: []string{"/server"},
LivenessProbe: &api.Probe{
Handler: api.Handler{
@@ -730,7 +730,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "liveness",
Image: "gcr.io/google_containers/liveness",
Image: "gcr.io/google_containers/liveness:e2e",
Command: []string{"/server"},
LivenessProbe: &api.Probe{
Handler: api.Handler{