raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge branch 'master' into fix-receive-timeout

Browse source
This commit is contained in:
Roman Niukhalov 2018-07-18 23:48:52 +07:00 • committed by GitHub
commit 76caee2cf4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala
View file

@ -195,7 +195,7 @@ class Dispatchers(val settings: ActorSystem.Settings, val prerequisites: Dispatc
/**
* Configurator for creating [[akka.dispatch.Dispatcher]].
* Returns the same dispatcher instance for for each invocation
* Returns the same dispatcher instance for each invocation
* of the `dispatcher()` method.
*/
class DispatcherConfigurator(config: Config, prerequisites: DispatcherPrerequisites)
@ -228,7 +228,7 @@ private[akka] object BalancingDispatcherConfigurator {
/**
* Configurator for creating [[akka.dispatch.BalancingDispatcher]].
* Returns the same dispatcher instance for for each invocation
* Returns the same dispatcher instance for each invocation
* of the `dispatcher()` method.
*/
class BalancingDispatcherConfigurator(_config: Config, _prerequisites: DispatcherPrerequisites)
@ -278,7 +278,7 @@ class BalancingDispatcherConfigurator(_config: Config, _prerequisites: Dispatche
/**
* Configurator for creating [[akka.dispatch.PinnedDispatcher]].
* Returns new dispatcher instance for for each invocation
* Returns new dispatcher instance for each invocation
* of the `dispatcher()` method.
*/
class PinnedDispatcherConfigurator(config: Config, prerequisites: DispatcherPrerequisites)

2
akka-remote/src/main/scala/akka/remote/artery/tcp/SSLEngineProvider.scala
View file

@ -207,7 +207,7 @@ object SSLEngineProviderSetup {
}
/**
* Setup for for defining a `SSLEngineProvider` that is passed in when ActorSystem
* Setup for defining a `SSLEngineProvider` that is passed in when ActorSystem
* is created rather than creating one from configured class name. That is useful
* when the SSLEngineProvider implementation require other external constructor parameters
* or is created before the ActorSystem is created.