github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33157 from YuPengZTE/devEG

Browse Source 
Automatic merge from submit-queue

'eg.' should be 'e.g.'
This commit is contained in:
Kubernetes Submit Queue 2016-09-24 00:53:38 -07:00 committed by GitHub
commit 9455b1de54
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apiserver/audit/audit.go
View File

@ -49,7 +49,7 @@ func (a *auditResponseWriter) WriteHeader(code int) {
} }
// fancyResponseWriterDelegator implements http.CloseNotifier, http.Flusher and // 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. // working.
type fancyResponseWriterDelegator struct { type fancyResponseWriterDelegator struct {
*auditResponseWriter *auditResponseWriter

2
test/e2e/framework/util.go
View File

@ -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. // Returns an error if timeout occurs first, or pod goes in to failed state.
func WaitForPodRunningInNamespace(c *client.Client, pod *api.Pod) error { func WaitForPodRunningInNamespace(c *client.Client, pod *api.Pod) error {
// this short-cicuit is needed for cases when we pass a list of pods instead // 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 // running pod for which waiting does not make sense and will always fail
if pod.Status.Phase == api.PodRunning { if pod.Status.Phase == api.PodRunning {
return nil return nil