diff --git a/config/akka-reference.conf b/config/akka-reference.conf index d59134d909..14933a3cac 100644 --- a/config/akka-reference.conf +++ b/config/akka-reference.conf @@ -32,7 +32,7 @@ service = on fair = on # should transactions be fair or non-fair (non fair yield better performance) max-nr-of-retries = 1000 # max nr of retries of a failing transaction before giving up - timeout = 10000 # transaction timeout; if transaction have not committed within the timeout then it is aborted + timeout = 10000 # transaction timeout; if transaction has not committed within the timeout then it is aborted distributed = off # not implemented yet diff --git a/config/akka.conf b/config/akka.conf index 94f630089a..84b9bfbbcf 100644 --- a/config/akka.conf +++ b/config/akka.conf @@ -1,4 +1,4 @@ -# This config import the Akka reference configuration. +# This config imports the Akka reference configuration. include "akka-reference.conf" # In this file you can override any option defined in the 'akka-reference.conf' file. diff --git a/pom.xml b/pom.xml index 49023e42c9..2e171337fa 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ * Persistence: A set of pluggable back-end storage modules that works in sync with the STM. * Cassandra distributed and highly scalable database. * MongoDB document database. - * Redis data structures database (upcoming) + * Redis data structures database. * REST (JAX-RS): Expose actors as REST services. * Comet: Expose actors as Comet services. * Security: Digest and Kerberos based security.