Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 40352a4ea48e
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a0111795780f
Choose a head ref
  • 2 commits
  • 9 files changed
  • 1 contributor

Commits on Aug 24, 2015

  1. Update joda time to 2.8.2.

    headius committed Aug 24, 2015
    Copy the full SHA
    5b12b47 View commit details
  2. Copy the full SHA
    a011179 View commit details
2 changes: 1 addition & 1 deletion pom.rb
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@
'bouncy-castle.version' => '1.47',
'github.global.server' => 'github',
'main.basedir' => '${project.basedir}',
'joda.time.version' => '2.5',
'joda.time.version' => '2.8.2',
'test-unit.version' => '3.0.3',
'power_assert.version' => '0.2.3' )

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -134,7 +134,7 @@ DO NOT MODIFIY - GENERATED CODE
<bouncy-castle.version>1.47</bouncy-castle.version>
<main.basedir>${project.basedir}</main.basedir>
<github.global.server>github</github.global.server>
<joda.time.version>2.5</joda.time.version>
<joda.time.version>2.8.2</joda.time.version>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
</properties>
<dependencyManagement>
1 change: 1 addition & 0 deletions spec/tags/ruby/core/time/local_tags.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
fails:Time.local creates the correct time just after dst change
fails(Joda Time behavior):Time.local respects rare old timezones
1 change: 1 addition & 0 deletions spec/tags/ruby/core/time/mktime_tags.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
fails:Time.mktime creates the correct time just after dst change
fails(Joda Time behavior):Time.mktime respects rare old timezones
1 change: 1 addition & 0 deletions spec/tags/ruby/core/time/new_tags.txt
Original file line number Diff line number Diff line change
@@ -3,3 +3,4 @@ fails:Time.new with a utc_offset argument raises ArgumentError if the String arg
fails:Time.new with a utc_offset argument with an argument that responds to #to_r coerces using #to_r
fails:Time.new with a utc_offset argument with an argument that responds to #to_str coerces using #to_str
fails:Time.new with a utc_offset argument returns a non-UTC time
fails(Joda Time behavior):Time.new respects rare old timezones
2 changes: 2 additions & 0 deletions spec/truffle/tags/core/time/comparison_tags.txt
Original file line number Diff line number Diff line change
@@ -2,3 +2,5 @@ fails:Time#<=> returns 1 if the first argument is a point in time after the seco
fails:Time#<=> returns -1 if the first argument is a point in time before the second argument
fails:Time#<=> returns 1 if the first argument is a fraction of a microsecond after the second argument
fails:Time#<=> returns -1 if the first argument is a fraction of a microsecond before the second argument
fails(Joda Time behavior):Time#<=> returns 1 if the first argument is a point in time after the second argument (down to a microsecond)
fails(Joda Time behavior):Time#<=> returns -1 if the first argument is a point in time before the second argument (down to a microsecond)
1 change: 1 addition & 0 deletions spec/truffle/tags/core/time/local_tags.txt
Original file line number Diff line number Diff line change
@@ -10,3 +10,4 @@ fails:Time.local ignores fractional seconds if a passed whole number of microsec
fails:Time.local ignores fractional seconds if a passed fractional number of microseconds
fails:Time.local timezone changes correctly adjusts the timezone change to 'EET' on 'Europe/Istanbul'
fails:Time.local timezone changes correctly adjusts the timezone change to 'CEST' on 'Europe/Amsterdam'
fails(Joda Time behavior):Time.local respects rare old timezones
1 change: 1 addition & 0 deletions spec/truffle/tags/core/time/mktime_tags.txt
Original file line number Diff line number Diff line change
@@ -10,3 +10,4 @@ fails:Time.mktime ignores fractional seconds if a passed whole number of microse
fails:Time.mktime ignores fractional seconds if a passed fractional number of microseconds
fails:Time.mktime timezone changes correctly adjusts the timezone change to 'EET' on 'Europe/Istanbul'
fails:Time.mktime timezone changes correctly adjusts the timezone change to 'CEST' on 'Europe/Amsterdam'
fails(Joda Time behavior):Time.mktime respects rare old timezones
1 change: 1 addition & 0 deletions spec/truffle/tags/core/time/new_tags.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
fails:Time.new with a utc_offset argument disallows a value for minutes greater than 59
fails:Time.new timezone changes correctly adjusts the timezone change to 'EET' on 'Europe/Istanbul'
fails:Time.new timezone changes correctly adjusts the timezone change to 'CEST' on 'Europe/Amsterdam'
fails(Joda Time behavior):Time.new respects rare old timezones