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

Cherry pick and merge #465 into scala 2.12 branch #469

Merged
merged 3 commits into from
Apr 2, 2018
Merged

Cherry pick and merge #465 into scala 2.12 branch #469

merged 3 commits into from
Apr 2, 2018

Conversation

johnynek
Copy link
Member

@johnynek johnynek commented Apr 1, 2018

This is a replacement of #463 by cherry-picking and merging #465 into the scala 2.12 branch ultimately closing #295 actually.

@dkomanov @ittaiz please take a look.

dkomanov and others added 2 commits April 1, 2018 11:53
@dkomanov @johnynek
Support JMH for scala 2.12 #295 (#465)
45984f5 
* Upgrade versions of JMH 1.17.4 -> 1.20, asm 5.0.4 -> 6.1.1

* Add reflection-based generator for JMH (make it default)
@johnynek
reenable the jmh test
ed9cdd5
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@johnynek johnynek added cla: yes and removed cla: no labels Apr 1, 2018
@googlebot
Copy link

☹️ Sorry, but only Googlers may change the label cla: yes.

@googlebot googlebot removed the cla: yes label Apr 1, 2018
@johnynek
Copy link
Member Author

johnynek commented Apr 1, 2018

both @dkomanov and I have signed the CLA, so this is fine.

@johnynek
Copy link
Member Author

johnynek commented Apr 1, 2018

closes #295

ittaiz
ittaiz approved these changes Apr 2, 2018
View reviewed changes
Copy link
Member

@ittaiz ittaiz left a comment

Choose a reason for hiding this comment

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

LGTM
@dkomanov,
If I remember correctly the 2.12 branch is somewhat stale with respect to other features. If this is a problem for you then maybe we should just create a new 2.12 branch from master by cherry picking what Gregg originally did

@johnynek johnynek merged commit 4ecc3f7 into scala2_12 Apr 2, 2018
@ittaiz ittaiz deleted the oscar/cherry_pick_jmh_fix_2_12 branch July 1, 2018 12:36
@smparkes smparkes mentioned this pull request Jan 30, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ittaiz ittaiz ittaiz 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.
4 participants
@johnynek @googlebot @ittaiz @dkomanov