Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
13859da2
Commit
13859da2
authored
Oct 13, 2015
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #15553 from dchen1107/fix
Auto commit by PR queue bot
parents
307fbeec
eb58db27
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
container_probe.go
test/e2e/container_probe.go
+1
-1
daemon_restart.go
test/e2e/daemon_restart.go
+1
-1
No files found.
test/e2e/container_probe.go
View file @
13859da2
...
...
@@ -120,7 +120,7 @@ func makePodSpec(readinessProbe, livenessProbe *api.Probe) *api.Pod {
ReadinessProbe
:
readinessProbe
,
},
{
Name
:
"test-noprobe"
,
Image
:
"
gcr.io/google_containers/pause
"
,
Image
:
"
beta.gcr.io/google_containers/pause:2.0
"
,
},
},
},
...
...
test/e2e/daemon_restart.go
View file @
13859da2
...
...
@@ -213,7 +213,7 @@ var _ = Describe("DaemonRestart", func() {
Client
:
framework
.
Client
,
Name
:
rcName
,
Namespace
:
ns
,
Image
:
"
kubernetes/pause
"
,
Image
:
"
beta.gcr.io/google_containers/pause:2.0
"
,
Replicas
:
numPods
,
CreatedPods
:
&
[]
*
api
.
Pod
{},
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment