Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Mirror changes from dotnet/coreclr#29082

Merged
ahsonkhan merged 1 commit into
masterfrom
mirror-merge-9615179
Apr 13, 2018
Merged

Mirror changes from dotnet/coreclr#29082
ahsonkhan merged 1 commit into
masterfrom
mirror-merge-9615179

Conversation

@dotnet-bot
Copy link
Copy Markdown

This PR contains mirrored changes from dotnet/coreclr

Please REBASE this PR when merging

)

Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
@ahsonkhan ahsonkhan merged commit 878dfda into master Apr 13, 2018
@ahsonkhan ahsonkhan deleted the mirror-merge-9615179 branch April 13, 2018 07:15
@ahsonkhan
Copy link
Copy Markdown

ahsonkhan commented Apr 13, 2018

@Anipik, I accidentally squashed and merged instead of rebase. Can you please check if the mirroring is still working as expected?

@ahsonkhan
Copy link
Copy Markdown

@Anipik, @safern, looks like mirroring isn't working.

Need this change mirrored: dotnet/coreclr#17532

@safern
Copy link
Copy Markdown
Member

safern commented Apr 13, 2018

Will take a look since @Anipik is at the doctor.

@ahsonkhan
Copy link
Copy Markdown

@safern, I made the change manually, to unblock CI in the dependencies updates PR: 41f5bfc

@safern
Copy link
Copy Markdown
Member

safern commented Apr 13, 2018

Ok, I just looked at the mirror and it looks like running fine now. Just whenever you merge the update PR it will have merge conflicts since the commit you added is not signed by the mirror. Once that happens we will have to fix the mirror to ignore that commit.

@karelz karelz added this to the 2.1.0 milestone Apr 14, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants