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

Merge pull request #21587 from akka/wip-merge-to-master-patriknw

Browse source 
Merge Artery into master
This commit is contained in:
Patrik Nordwall 2016-09-29 15:45:27 +02:00 • committed by GitHub
commit 577f43233a
315 changed files with 38582 additions and 832 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-docs/rst/general/configuration.rst
View file

@ -153,7 +153,7 @@ A custom ``application.conf`` might look like this::
logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
actor {
provider = "akka.cluster.ClusterActorRefProvider"
provider = "cluster"
default-dispatcher {
# Throughput for default Dispatcher, set to 1 for as fair as possible

4
akka-docs/rst/java/cluster-client.rst
View file

@ -19,8 +19,8 @@ i.e. not necessarily the initial contact points.
provided in a more efficient way by :ref:`distributed-pub-sub-java` for actors that
belong to the same cluster.
Also, note it's necessary to change ``akka.actor.provider`` from ``akka.actor.LocalActorRefProvider``
to ``akka.remote.RemoteActorRefProvider`` or ``akka.cluster.ClusterActorRefProvider`` when using
Also, note it's necessary to change ``akka.actor.provider`` from ``local``
to ``remote`` or ``cluster`` when using
the cluster client.
The receptionist is supposed to be started on all nodes, or all nodes with specified role,

2
akka-docs/rst/java/cluster-usage.rst
View file

@ -31,7 +31,7 @@ The ``application.conf`` configuration looks like this:
.. includecode:: ../../../akka-samples/akka-sample-cluster-java/src/main/resources/application.conf#snippet
To enable cluster capabilities in your Akka project you should, at a minimum, add the :ref:`remoting-java`
settings, but with ``akka.cluster.ClusterActorRefProvider``.
settings, but with ``cluster``.
The ``akka.cluster.seed-nodes`` should normally also be added to your ``application.conf`` file.
.. note::

4
akka-docs/rst/java/remoting.rst
View file

@ -31,7 +31,7 @@ to your ``application.conf`` file::
akka {
actor {
provider = "akka.remote.RemoteActorRefProvider"
provider = remote
}
remote {
enabled-transports = ["akka.remote.netty.tcp"]
@ -44,7 +44,7 @@ to your ``application.conf`` file::
As you can see in the example above there are four things you need to add to get started:
* Change provider from ``akka.actor.LocalActorRefProvider`` to ``akka.remote.RemoteActorRefProvider``
* Change provider from ``local`` to ``remote``
* Add host name - the machine you want to run the actor system on; this host
name is exactly what is passed to remote systems in order to identify this
system and consequently used for connecting back to this system if need be,

4
akka-docs/rst/scala/cluster-client.rst
View file

@ -19,8 +19,8 @@ i.e. not necessarily the initial contact points.
provided in a more efficient way by :ref:`distributed-pub-sub-scala` for actors that
belong to the same cluster.
Also, note it's necessary to change ``akka.actor.provider`` from ``akka.actor.LocalActorRefProvider``
to ``akka.remote.RemoteActorRefProvider`` or ``akka.cluster.ClusterActorRefProvider`` when using
Also, note it's necessary to change ``akka.actor.provider`` from ``local``
to ``remote`` or ``cluster`` when using
the cluster client.
The receptionist is supposed to be started on all nodes, or all nodes with specified role,

2
akka-docs/rst/scala/cluster-usage.rst
View file

@ -25,7 +25,7 @@ The ``application.conf`` configuration looks like this:
.. includecode:: ../../../akka-samples/akka-sample-cluster-scala/src/main/resources/application.conf#snippet
To enable cluster capabilities in your Akka project you should, at a minimum, add the :ref:`remoting-scala`
settings, but with ``akka.cluster.ClusterActorRefProvider``.
settings, but with ``cluster``.
The ``akka.cluster.seed-nodes`` should normally also be added to your ``application.conf`` file.
.. note::

2
akka-docs/rst/scala/code/docs/cluster/ClusterDocSpec.scala
View file

@ -10,7 +10,7 @@ object ClusterDocSpec {
val config =
"""
akka.actor.provider = "akka.cluster.ClusterActorRefProvider"
akka.actor.provider = "cluster"
akka.remote.netty.tcp.port = 0
"""
}

2
akka-docs/rst/scala/code/docs/ddata/DistributedDataDocSpec.scala
View file

@ -19,7 +19,7 @@ object DistributedDataDocSpec {
val config =
"""
akka.actor.provider = "akka.cluster.ClusterActorRefProvider"
akka.actor.provider = "cluster"
akka.remote.netty.tcp.port = 0
#//#serializer-config

2
akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
View file

@ -19,7 +19,7 @@ object RemoteDeploymentDocSpec {
}
class RemoteDeploymentDocSpec extends AkkaSpec("""
akka.actor.provider = "akka.remote.RemoteActorRefProvider"
akka.actor.provider = remote
akka.remote.netty.tcp {
port = 0
}

4
akka-docs/rst/scala/remoting.rst
View file

@ -27,7 +27,7 @@ to your ``application.conf`` file::
akka {
actor {
provider = "akka.remote.RemoteActorRefProvider"
provider = remote
}
remote {
enabled-transports = ["akka.remote.netty.tcp"]
@ -40,7 +40,7 @@ to your ``application.conf`` file::
As you can see in the example above there are four things you need to add to get started:
* Change provider from ``akka.actor.LocalActorRefProvider`` to ``akka.remote.RemoteActorRefProvider``
* Change provider from ``local`` to ``remote``
* Add host name - the machine you want to run the actor system on; this host
name is exactly what is passed to remote systems in order to identify this
system and consequently used for connecting back to this system if need be,