Skip to content

Commit

Permalink
Merge pull request kubernetes#33157 from YuPengZTE/devEG
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

'eg.' should be 'e.g.'
  • Loading branch information
Kubernetes Submit Queue authored Sep 24, 2016
2 parents d728afc + 5865a31 commit 9455b1d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/apiserver/audit/audit.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9455b1d

Please sign in to comment.