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

Update .mailmap #63801

Merged
merged 2 commits into from
Aug 23, 2019
Merged

Update .mailmap #63801

merged 2 commits into from
Aug 23, 2019

Conversation

jeremystucki
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 22, 2019
@rust-highfive
Copy link
Collaborator

Your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-08-22T08:07:48.5857572Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-22T08:07:48.6055863Z ##[command]git config gc.auto 0
2019-08-22T08:07:48.6128887Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-22T08:07:48.6179561Z ##[command]git config --get-all http.proxy
2019-08-22T08:07:48.6304125Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/63801/merge:refs/remotes/pull/63801/merge
2019-08-22T08:07:50.8805778Z remote:                                                                                         
---
2019-08-22T08:08:25.2764105Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-22T08:08:25.2765141Z 
2019-08-22T08:08:25.2766322Z   git checkout -b <new-branch-name>
2019-08-22T08:08:25.2767645Z 
2019-08-22T08:08:25.2768690Z HEAD is now at ff37b3b4d Merge 6ce242fb6e46bad46c64ae662091e18594521a4b into 42dcd4b7c5fb7b61bc2f4c0842f66e5ad40057e4
2019-08-22T08:08:25.2929067Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-22T08:08:25.2931815Z ==============================================================================
2019-08-22T08:08:25.2931860Z Task         : Bash
2019-08-22T08:08:25.2931908Z Description  : Run a Bash script on macOS, Linux, or Windows

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@jonas-schievink
Copy link
Contributor

r? @jonas-schievink @bors r+ rollup

CI failure looks spurious.

@bors
Copy link
Contributor

bors commented Aug 22, 2019

📌 Commit 6ce242f has been approved by jonas-schievink

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 22, 2019
@mati865
Copy link
Contributor

mati865 commented Aug 22, 2019

Is this format right?
See #63600 (comment)

@jonas-schievink
Copy link
Contributor

jonas-schievink commented Aug 22, 2019

@bors r-

You're right. We should fix the existing mailmap entries to avoid this confusion in the future. seems like no other entries are wrong

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 22, 2019
@jeremystucki
Copy link
Contributor Author

Ah sorry about that, will fix ASAP

@jonas-schievink
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 22, 2019

📌 Commit 2f790ee has been approved by jonas-schievink

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 22, 2019
@bors
Copy link
Contributor

bors commented Aug 23, 2019

⌛ Testing commit 2f790ee with merge a71e32e...

bors added a commit that referenced this pull request Aug 23, 2019
@bors
Copy link
Contributor

bors commented Aug 23, 2019

☀️ Test successful - checks-azure
Approved by: jonas-schievink
Pushing a71e32e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 23, 2019
@bors bors merged commit 2f790ee into rust-lang:master Aug 23, 2019
@jeremystucki jeremystucki deleted the patch-1 branch August 23, 2019 05:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants