Commit 9455b1de authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #33157 from YuPengZTE/devEG

Automatic merge from submit-queue 'eg.' should be 'e.g.'
parents d728afc5 5865a31e
...@@ -49,7 +49,7 @@ func (a *auditResponseWriter) WriteHeader(code int) { ...@@ -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
......
...@@ -1370,7 +1370,7 @@ func CheckInvariants(events []watch.Event, fns ...InvariantFunc) error { ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment