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

HBASE-21257 misspelled words.[occured -> occurred] #91

Closed
wants to merge 3 commits into from
Closed

HBASE-21257 misspelled words.[occured -> occurred] #91

wants to merge 3 commits into from

Conversation

gangxueZhang
Copy link

@gangxueZhang gangxueZhang commented Sep 29, 2018 •
edited
Loading

hi!
This PR does not affect the program function. It only modifies the misspelled words in the exception information and changes "occured" to "occurred".
Found in HBASE-21257

@busbey
Copy link
Contributor

busbey commented Sep 29, 2018

Hi!

Thanks for taking the time to put together this PR. The HBase project uses the HBASE tracker in ASF JIRA instance to review and apply work. Would you mind filing a request there that describes the problem and proposed solution?

Our contributor guide section includes instructions on how to attach a patch to your issue once it exists.

Thanks for your interest in improving Apache HBase!

@gangxueZhang
Copy link
Author

hi!
This PR does not affect the program function. It only modifies the misspelled words in the exception information and changes "occured" to "occurred".
Found in jira :HBASE-21257

@gangxueZhang gangxueZhang changed the title misspelled words.[occured -> occurred] HBASE-21257 misspelled words.[occured -> occurred] Oct 25, 2018
@Apache9
Copy link
Contributor

Apache9 commented Apr 6, 2019

Hey @gangxueZhang the GitHub integration for HBase has been set up, could you please update the PR since there are conflicts?

Thanks.

@Apache-HBase
Copy link

💔 -1 overall

Vote Subsystem Runtime Comment
0 reexec 0 Docker mode activated.
-1 patch 6 #91 does not apply to master. Rebase required? Wrong Branch? See https://yetus.apache.org/documentation/in-progress/precommit-patchnames for help.
Subsystem Report/Notes
GITHUB PR #91
Console output https://builds.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-91/1/console
Powered by Apache Yetus 0.9.0 http://yetus.apache.org

This message was automatically generated.

@Apache9
Copy link
Contributor

Apache9 commented Apr 6, 2019

@gangxueZhang Please combine your commits into one commit? Thanks.

@gangxueZhang
Copy link
Author

@Apache9 Hello, I am not very familiar with github now. Can you guide me how to merge these two commits? I will operate here. Thank you.

@Apache9
Copy link
Contributor

Apache9 commented Apr 7, 2019

Just check out the newest master of hbase, and cherry-pick your old patch, resolve conflicts, then force push to your master, the PR here will be changed automatically.

@Apache-HBase
Copy link

💔 -1 overall

Vote Subsystem Runtime Comment
0 reexec 0 Docker mode activated.
-1 patch 5 #91 does not apply to master. Rebase required? Wrong Branch? See https://yetus.apache.org/documentation/in-progress/precommit-patchnames for help.
Subsystem Report/Notes
GITHUB PR #91
Console output https://builds.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-91/2/console
Powered by Apache Yetus 0.9.0 http://yetus.apache.org

This message was automatically generated.

@gangxueZhang
Copy link
Author

@Apache9 Hey, I have done what you said, but I don't know if it is right, help me confirm it,please.

@Apache9
Copy link
Contributor

Apache9 commented Apr 7, 2019

You have some merge commits in your own repo, which leads to conflicts. I suggest you record the commit id 'fcfa14e2f176d19e9ce984fe4687c3e1fd57e66f', and then reset to an earlier commit before the merge commits, and then sync with the master branch of apache/hbase again, and then cherry-pick the 'fcfa14e2f176d19e9ce984fe4687c3e1fd57e66f'. And last, do a force push your master branch.

@Apache-HBase
Copy link

💔 -1 overall

Vote Subsystem Runtime Comment
0 reexec 0 Docker mode activated.
-1 patch 6 #91 does not apply to master. Rebase required? Wrong Branch? See https://yetus.apache.org/documentation/in-progress/precommit-patchnames for help.
Subsystem Report/Notes
GITHUB PR #91
Console output https://builds.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-91/3/console
Powered by Apache Yetus 0.9.0 http://yetus.apache.org

This message was automatically generated.

@Apache-HBase
Copy link

💔 -1 overall

Vote Subsystem Runtime Comment
0 reexec 0 Docker mode activated.
-1 patch 5 #91 does not apply to master. Rebase required? Wrong Branch? See https://yetus.apache.org/documentation/in-progress/precommit-patchnames for help.
Subsystem Report/Notes
GITHUB PR #91
Console output https://builds.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-91/4/console
Powered by Apache Yetus 0.9.0 http://yetus.apache.org

This message was automatically generated.

zhanggangxue added 2 commits April 9, 2019 09:17
Merge branch 'master' of https://github.com/apache/hbase
81973e4 
# Conflicts:
#	hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessChecker.java
misspelled words.[occured -> occurred]
dbcceea 
(cherry picked from commit c7ac518)
@gangxueZhang
Copy link
Author

@Apache9 Hi, is this OK？ if not, can I close this PR and submit a new PR based on the latest version?

@Apache-HBase
Copy link

💔 -1 overall

Vote Subsystem Runtime Comment
0 reexec 0 Docker mode activated.
-1 patch 6 #91 does not apply to master. Rebase required? Wrong Branch? See https://yetus.apache.org/documentation/in-progress/precommit-patchnames for help.
Subsystem Report/Notes
GITHUB PR #91
Console output https://builds.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-91/5/console
Powered by Apache Yetus 0.9.0 http://yetus.apache.org

This message was automatically generated.

@Apache9
Copy link
Contributor

Apache9 commented Apr 9, 2019

Seems the robot is still not able to apply the patch.

@gangxueZhang Yes, you can close this one and open a new one, if it is easier for you.

Thanks.

@gangxueZhang gangxueZhang mentioned this pull request Apr 13, 2019
Merged
@gangxueZhang
Copy link
Author

@Apache9 Hey, this PR has been closed by me, and a new PR#146 has been created to replace it. If there is no problem, please merge the changes in PR#146.

ndimiduk pushed a commit to ndimiduk/hbase that referenced this pull request May 16, 2024
@bbeaudreault
Reuse some healthcheck code (apache#91)
6c01d85
szucsvillo pushed a commit to szucsvillo/hbase that referenced this pull request Aug 16, 2024
@petersomogyi @bbeaudreault
CDPD-71321: HBASE-28338 Bounded leak of FSDataInputStream buffers fro…
d0a418d 
…m checksum switching (apache#5660) (apache#91)

Signed-off-by: Duo Zhang <[email protected]>
(cherry picked from commit c28e285)

Co-authored-by: Bryan Beaudreault <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@toyokazu03102478 toyokazu03102478 toyokazu03102478 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.
5 participants
@gangxueZhang @busbey @Apache9 @Apache-HBase @toyokazu03102478