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
9455b1de
Commit
9455b1de
authored
Sep 24, 2016
by
Kubernetes Submit Queue
Committed by
GitHub
Sep 24, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #33157 from YuPengZTE/devEG
Automatic merge from submit-queue 'eg.' should be 'e.g.'
parents
d728afc5
5865a31e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
audit.go
pkg/apiserver/audit/audit.go
+1
-1
util.go
test/e2e/framework/util.go
+1
-1
No files found.
pkg/apiserver/audit/audit.go
View file @
9455b1de
...
...
@@ -49,7 +49,7 @@ func (a *auditResponseWriter) WriteHeader(code int) {
}
// fancyResponseWriterDelegator implements http.CloseNotifier, http.Flusher and
// http.Hijacker which are needed to make certain http operation (eg. watch, rsh, etc)
// http.Hijacker which are needed to make certain http operation (e
.
g. watch, rsh, etc)
// working.
type
fancyResponseWriterDelegator
struct
{
*
auditResponseWriter
...
...
test/e2e/framework/util.go
View file @
9455b1de
...
...
@@ -1370,7 +1370,7 @@ func CheckInvariants(events []watch.Event, fns ...InvariantFunc) error {
// Returns an error if timeout occurs first, or pod goes in to failed state.
func
WaitForPodRunningInNamespace
(
c
*
client
.
Client
,
pod
*
api
.
Pod
)
error
{
// this short-cicuit is needed for cases when we pass a list of pods instead
// of newly created pod (eg. VerifyPods) which means we are getting already
// of newly created pod (e
.
g. VerifyPods) which means we are getting already
// running pod for which waiting does not make sense and will always fail
if
pod
.
Status
.
Phase
==
api
.
PodRunning
{
return
nil
...
...
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