Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: Matt Lord <mattalord@gmail.com>
mattlord committed Jan 30, 2025

Verified

This commit was signed with the committer’s verified signature.
mattlord Matt Lord
1 parent c877e38 commit 478dd79
Showing 3 changed files with 1 addition and 207 deletions.
197 changes: 0 additions & 197 deletions go/vt/mysqlctl/blackbox/utils.go

This file was deleted.

7 changes: 1 addition & 6 deletions go/vt/mysqlctl/filebackupstorage/file.go
Original file line number Diff line number Diff line change
@@ -27,13 +27,8 @@ import (

"github.com/spf13/pflag"

<<<<<<< HEAD
=======
"vitess.io/vitess/go/os2"
"vitess.io/vitess/go/vt/mysqlctl/errors"

>>>>>>> 770dcf0914 (Replace uses of os.Create with os2.Create within backup/restore workflows (#17648))
"vitess.io/vitess/go/ioutil"
"vitess.io/vitess/go/os2"
"vitess.io/vitess/go/vt/concurrency"
stats "vitess.io/vitess/go/vt/mysqlctl/backupstats"
"vitess.io/vitess/go/vt/mysqlctl/backupstorage"
4 changes: 0 additions & 4 deletions go/vt/mysqlctl/mysqld.go
Original file line number Diff line number Diff line change
@@ -46,11 +46,7 @@ import (
"vitess.io/vitess/config"
"vitess.io/vitess/go/mysql"
"vitess.io/vitess/go/mysql/sqlerror"
<<<<<<< HEAD
=======
"vitess.io/vitess/go/os2"
"vitess.io/vitess/go/osutil"
>>>>>>> 770dcf0914 (Replace uses of os.Create with os2.Create within backup/restore workflows (#17648))
"vitess.io/vitess/go/protoutil"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/vt/dbconfigs"

0 comments on commit 478dd79

Please sign in to comment.