snap: merge pre-ga into master #2168
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 12 commits
July 19, 2017 11:15
Signed-off-by: Cholerae Hu <huyingqian@pingcap.com>
Signed-off-by: Cholerae Hu <huyingqian@pingcap.com>
This reverts commit ccef26a.
Signed-off-by: Cholerae Hu <huyingqian@pingcap.com>
Signed-off-by: Cholerae Hu <huyingqian@pingcap.com>
Signed-off-by: Cholerae Hu <huyingqian@pingcap.com>
|
please fix the conflict |
choleraehyq
changed the title
added 2 commits
August 16, 2017 16:28
Signed-off-by: Cholerae Hu <huyingqian@pingcap.com>
|
@zhangjinpeng1987 PTAL |
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@zhangjinpeng1987 @siddontang @BusyJay PTAL
Consistency check test cluster is running.