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.

Sign up for GitHub

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

Jump to bottom

delete blockWrite.go use blockwrite.go instead #333

Merged
merged 18 commits into from
Mar 21, 2019
Merged

delete blockWrite.go use blockwrite.go instead #333

merged 18 commits into from
Mar 21, 2019

Conversation

shuijing198799
Copy link
Contributor

1.delete blockWrite.go

shuijing198799 and others added 18 commits March 15, 2019 21:32
@shuijing198799
add schduler test case
a7e16bf
@shuijing198799
delete unnessary step and add scheduled-backup-job check step
2746c82
@shuijing198799
change name to backupPVC
79dfe9a
@shuijing198799
return a string instead of int in getbackupdir
3dbddde
@shuijing198799
conflict resovle
2eb505d
@shuijing198799
resolve some merge error and naming conflict
84d4698
@shuijing198799
resolve some merge error and naming conflict
aa70d18
@shuijing198799
add binlog process
43ba7c7
@shuijing198799
conflict resolve
085d0bf
@shuijing198799
add setting to helmsetstring and add create secret
5d6a0ed
@shuijing198799
fullfil the comments
994c9ae
@shuijing198799
Merge branch 'stability' into yinliang/backup-and-restore
8c924f8
@shuijing198799
Merge branch 'stability' into yinliang/backup-and-restore
9ec00d4
@shuijing198799
prewrite secret name
c2a14ef
@shuijing198799
Merge branch 'yinliang/backup-and-restore' of https://github.com/shui…
ac39382 
…jing198799/tidb-operator into yinliang/backup-and-restore
@shuijing198799
change password method
51ed069
@shuijing198799
Merge remote-tracking branch 'remotes/upstream/stability' into yinlia…
2d50c36 
…ng/backup-and-restore
@shuijing198799
delete blockWriter.go use blockwriter.go instead
87a884f
@shuijing198799
Copy link
Contributor Author

@cwen0 @zyguan @xiaojingchen @weekface PTAL

@weekface weekface merged commit 139ca15 into pingcap:stability Mar 21, 2019
weekface pushed a commit to weekface/tidb-operator that referenced this pull request Mar 21, 2019
@shuijing198799 @weekface
delete blockWrite.go use blockwrite.go instead (pingcap#333)
6002c95 
* delete blockWriter.go use blockwriter.go instead
tennix pushed a commit that referenced this pull request Mar 21, 2019
@shuijing198799 @tennix
delete blockWrite.go use blockwrite.go instead (#333)
72b6f97 
* delete blockWriter.go use blockwriter.go instead
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weekface weekface weekface approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@shuijing198799 @weekface