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

1311 datetime comparision #1317

Closed
wants to merge 7 commits into from
Closed

1311 datetime comparision #1317

wants to merge 7 commits into from

Conversation

@lucasallan
Copy link
Member

@lucasallan lucasallan commented Dec 9, 2013

Fixing #1311

@lucasallan
Copy link
Member Author

@lucasallan lucasallan commented Dec 9, 2013

@Sinjo done! Thanks!

@Sinjo
Copy link
Contributor

@Sinjo Sinjo commented Dec 9, 2013

@lucasallan Awesome, cool to see it fixed. Probably worth making sure these commits get applied (haven't looked if they just apply cleanly, suspect they may not due to path changes) on the jruby-1_7 branch so they go into the next 1.7.x patch release. :-)

@lucasallan
Copy link
Member Author

@lucasallan lucasallan commented Dec 9, 2013

@Sinjo Sounds great. Thanks :D

@headius
Copy link
Member

@headius headius commented Dec 10, 2013

If this should go into 1.7, it might be better to reapply the fixes to 1.7, since we merge from there to master.

We can also merge this and then do a second PR for the 1.7 branch, but it makes the merge logs a little weird.

@headius
Copy link
Member

@headius headius commented Dec 10, 2013

Actually, I managed to cherry-pick all commits just fine, and will run some local tests. If all is well, I'll push, merge to master, and call this one done.

@lucasallan
Copy link
Member Author

@lucasallan lucasallan commented Dec 10, 2013

Thanks @headius :D

@headius
Copy link
Member

@headius headius commented Dec 10, 2013

Cherry-picked to jruby-1_7 up to b11ad9a and merged to master at 11ee84b.

I also fixed the misspelling in the test name and will commit that to MRI trunk.

@headius headius closed this Dec 10, 2013
@lucasallan
Copy link
Member Author

@lucasallan lucasallan commented Dec 10, 2013

@headius Sorry about it, english isn't my native language.

@headius
Copy link
Member

@headius headius commented Dec 10, 2013

No problem :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants