Skip to content

Commit ae150b9

Browse files
committed
Merged 0.6.1 Actress updates into native Atomic branch.
1 parent 073d9d1 commit ae150b9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ end
1414

1515
group :documentation do
1616
gem 'countloc', '~> 0.4.0', :platforms => :mri, :require => false
17-
gem 'yard', '~> 0.8.7.4', :platforms => :mri, :require => false
17+
gem 'yard', '~> 0.8.7.4', :require => false
1818
gem 'inch', '~> 0.4.1', :platforms => :mri, :require => false
19-
gem 'redcarpet', platforms: :mri # understands github markdown
19+
gem 'redcarpet', '~> 3.1.2', platforms: :mri # understands github markdown
2020
end

lib/concurrent/configuration.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'thread'
22
require 'concurrent/delay'
33
require 'concurrent/errors'
4-
require 'concurrent/atomic/atomic'
4+
require 'concurrent/atomic'
55
require 'concurrent/executor/thread_pool_executor'
66
require 'concurrent/executor/timer_set'
77
require 'concurrent/utility/processor_count'

0 commit comments

Comments
 (0)