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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

jruby-1_7 merge failures on master #3188

Closed
kares opened this issue Jul 26, 2015 · 3 comments
Closed

jruby-1_7 merge failures on master #3188

kares opened this issue Jul 26, 2015 · 3 comments

Comments

@kares
Copy link
Member

@kares kares commented Jul 26, 2015

... probably something 馃敡 on my end NOT understanding the change-set enough :(

@mkristian I know its an added time but please consider merging changes such as these from jruby-1_7 promptly as if you re-call its not the first time and its quite hard for someone not understanding the branch diversions you did esp. uri:classloader:/ magic + ITs

@kares kares added the internal label Jul 26, 2015
@mkristian
Copy link
Member

@mkristian mkristian commented Jul 26, 2015

@kares I wanted to do the merge first thing on monday. but you are right I will do merge things immediately the next time.

all those problems above seems to be on my plate.

@mkristian
Copy link
Member

@mkristian mkristian commented Jul 27, 2015

@kares I think I fixed all those little things beside the compiler https://travis-ci.org/jruby/jruby/jobs/72823180

NPE in reflect.Method :( not sure where this comes from

@kares
Copy link
Member Author

@kares kares commented Jul 27, 2015

@mkristian yes you did, thanks. I also maybe shouldn't have started merging on weekend.
the compiler spec was introduced (today) at 8f80816 ... left a comment there

@kares kares closed this Jul 27, 2015
@enebo enebo added this to the JRuby 9.0.1.0 milestone Aug 20, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
3 participants