Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some misspells #4658

Merged
merged 1 commit into from
Feb 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/GitHubWorkflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ test` from the root of the Git tree.
If you haven't installed all dependencies for `make test`, you can rely on the Travis CI test results as well.
These results will be linked on your pull request.

## Commiting your work
## Committing your work

When running `git commit` use the `-s` option to add a Signed-off-by line.
This is needed for [the Developer Certificate of Origin](https://github.com/apps/dco).
Expand Down
2 changes: 1 addition & 1 deletion go/vt/vtgate/safe_session.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (session *SafeSession) SetAutocommitable(flag bool) {
}

// AutocommitApproval returns true if we can perform a single round-trip
// autocommit. If so, the caller is responsible for commiting their
// autocommit. If so, the caller is responsible for committing their
// transaction.
func (session *SafeSession) AutocommitApproval() bool {
session.mu.Lock()
Expand Down
2 changes: 1 addition & 1 deletion go/vt/vttablet/tabletserver/tx_executor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ func TestTxExecutorCommit(t *testing.T) {
if err != nil {
t.Error(err)
}
// Commiting an absent transaction should succeed.
// Committing an absent transaction should succeed.
err = txe.CommitPrepared("bb")
if err != nil {
t.Error(err)
Expand Down
4 changes: 2 additions & 2 deletions go/vt/vttablet/tabletserver/tx_prep_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
)

var (
errPrepCommiting = errors.New("commiting")
errPrepCommitting = errors.New("committing")
errPrepFailed = errors.New("failed")
)

Expand Down Expand Up @@ -101,7 +101,7 @@ func (pp *TxPreparedPool) FetchForCommit(dtid string) (*TxConnection, error) {
c, ok := pp.conns[dtid]
if ok {
delete(pp.conns, dtid)
pp.reserved[dtid] = errPrepCommiting
pp.reserved[dtid] = errPrepCommitting
}
return c, nil
}
Expand Down
2 changes: 1 addition & 1 deletion go/vt/vttablet/tabletserver/tx_prep_pool_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func TestPrepFetchForCommit(t *testing.T) {
t.Errorf("pp.Get(aa): %p, want %p", got, conn)
}
got, err = pp.FetchForCommit("aa")
want := "commiting"
want := "committing"
if err == nil || err.Error() != want {
t.Errorf("FetchForCommit err: %v, want %s", err, want)
}
Expand Down