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

Add test for field awaited in JTF run delegate #342

Merged
merged 1 commit into from
Aug 8, 2018
Merged

Add test for field awaited in JTF run delegate #342

merged 1 commit into from
Aug 8, 2018

Conversation

sharwell
Copy link
Member

@sharwell sharwell commented Aug 6, 2018

Closes #254

AArnott
AArnott approved these changes Aug 7, 2018
View reviewed changes
Copy link
Member

@AArnott AArnott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Can you rebase to the 15.8 branch?

@sharwell sharwell force-pushed the test-awaited-field branch from 3dc9df8 to a052d16 Compare August 7, 2018 15:05
@sharwell sharwell changed the base branch from master to v15.8 August 7, 2018 15:05
@sharwell sharwell changed the base branch from v15.8 to master August 7, 2018 15:06
@sharwell sharwell changed the base branch from master to v15.8 August 7, 2018 15:06
@sharwell sharwell closed this Aug 7, 2018
@sharwell sharwell reopened this Aug 7, 2018
@sharwell
Copy link
Member Author

sharwell commented Aug 7, 2018

@AArnott rebase and retarget complete

@AArnott
Copy link
Member

AArnott commented Aug 7, 2018

Thanks. Evidently the master branch had some test enhancements that 15.8 lacks, and the compile break is real. We can just take this to master to avoid you having to rewrite.

@AArnott AArnott changed the base branch from v15.8 to master August 7, 2018 16:42
@AArnott
Copy link
Member

AArnott commented Aug 7, 2018

Rats. There are merge conflicts. Can you resolve this? You can go either way (fix up the v15.8 build break or fix the merge conflict with master). Thanks.

@sharwell
Copy link
Member Author

sharwell commented Aug 8, 2018

I'll figure this out tonight. It's no rush since it was just an added test. 😄

@sharwell
Copy link
Member Author

sharwell commented Aug 8, 2018 •
edited
Loading

The referenced was fixed in #308 (master branch), so I am moving the PR back to target master.

@sharwell sharwell force-pushed the test-awaited-field branch from a052d16 to af8206c Compare August 8, 2018 17:58
@sharwell
Copy link
Member Author

sharwell commented Aug 8, 2018

@AArnott rebased again 😄

@AArnott AArnott merged commit 985bd5d into microsoft:master Aug 8, 2018
@sharwell sharwell deleted the test-awaited-field branch August 8, 2018 18:32
AArnott added a commit that referenced this pull request Jan 27, 2025
@AArnott
Merge pull request #342 from AArnott/mlc
e562b36 
Add markup link checker to GitHub workflow
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AArnott AArnott AArnott approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@sharwell @AArnott