Merge branch 'master' into wip-derekjw
Conflicts: akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala akka-actor/src/main/scala/akka/actor/ActorRef.scala
This commit is contained in:
commit
6d343b01f0
130 changed files with 1957 additions and 869 deletions
|
|
@ -68,6 +68,11 @@ trait MessageDispatcher {
|
|||
*/
|
||||
private[akka] def createMailbox(actorRef: ActorRef): AnyRef
|
||||
|
||||
/**
|
||||
* Name of this dispatcher.
|
||||
*/
|
||||
def name: String
|
||||
|
||||
/**
|
||||
* Attaches the specified actorRef to this dispatcher
|
||||
*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue