Merge branch 'wip-cluster-membership-jboner'

This commit is contained in:
Jonas Bonér 2012-03-14 15:31:41 +01:00
commit fdb9743dc6
26 changed files with 2547 additions and 856 deletions

View file

@ -154,7 +154,7 @@ Defining States
A state is defined by one or more invocations of the method
:func:`when(<name>[, stateTimeout = <timeout>])(stateFunction)`.
The given name must be an object which is type-compatible with the first type
parameter given to the :class:`FSM` trait. This object is used as a hash key,
so you must ensure that it properly implements :meth:`equals` and
@ -437,7 +437,7 @@ and in the following.
Event Tracing
-------------
The setting ``akka.actor.debug.fsm`` in `:ref:`configuration` enables logging of an
The setting ``akka.actor.debug.fsm`` in :ref:`configuration` enables logging of an
event trace by :class:`LoggingFSM` instances::
class MyFSM extends Actor with LoggingFSM[X, Z] {