1311 datetime comparision #1317

Closed
wants to merge 7 commits into
from

Projects

None yet

4 participants

@lucasallan
Member

Fixing #1311

@lucasallan
Member

@Sinjo done! Thanks!

@Sinjo
Contributor
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
Member

@Sinjo Sounds great. Thanks :D

@headius
Member
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
Member
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
Member

Thanks @headius :D

@headius
Member
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
Member

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

@headius
Member
headius commented Dec 10, 2013

No problem :-)

@enebo enebo modified the milestone: JRuby 1.7.10, JRuby 1.7.11 Feb 24, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment