Merge pull request #16255 from leonidb/master

+per #15279 FSM for PersistentActor
This commit is contained in:
Patrik Nordwall 2015-06-01 13:13:47 +02:00
commit d2a00d3b98
22 changed files with 3595 additions and 16 deletions

View file

@ -111,7 +111,7 @@ object PerformanceSpec {
}
}
class PerformanceSpec extends AkkaSpec(PersistenceSpec.config("leveldb", "PerformanceSpec", serialization = "off").withFallback(ConfigFactory.parseString(PerformanceSpec.config))) with PersistenceSpec with ImplicitSender {
class PerformanceSpec extends PersistenceSpec(PersistenceSpec.config("leveldb", "PerformanceSpec", serialization = "off").withFallback(ConfigFactory.parseString(PerformanceSpec.config))) with ImplicitSender {
import PerformanceSpec._
val loadCycles = system.settings.config.getInt("akka.persistence.performance.cycles.load")