Merge branch 'wip-typed-actor-jboner' into master

Browse source

Conflicts:
	akka-core/src/test/scala/ActiveObjectContextSpec.scala
	akka-core/src/test/scala/ActiveObjectGuiceConfiguratorSpec.scala
	akka-core/src/test/scala/ActorObjectUtilFunctionsSpec.scala
	akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/NestedTransactionalTypedActorSpec.scala
	akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/RemoteTransactionalTypedActorSpec.scala
	akka-core/src/test/scala/RestartNestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/RestartNestedTransactionalTypedActorSpec.scala
	akka-core/src/test/scala/RestartTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/RestartTransactionalTypedActorSpec.scala
	akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/TransactionalTypedActorSpec.scala
	akka-core/src/test/scala/TypedActorContextSpec.scala
	akka-core/src/test/scala/TypedActorGuiceConfiguratorSpec.scala
	akka-core/src/test/scala/TypedActorUtilFunctionsSpec.scala
	akka-core/src/test/scala/actor/ActiveObjectContextSpec.scala
	akka-core/src/test/scala/actor/ActiveObjectGuiceConfiguratorSpec.scala
	akka-core/src/test/scala/actor/ActiveObjectLifecycleSpec.scala
	akka-core/src/test/scala/actor/ActorObjectUtilFunctionsSpec.scala
	akka-core/src/test/scala/actor/NestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/actor/RestartNestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/actor/RestartTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/actor/TransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/remote/RemoteTransactionalActiveObjectSpec.scala

...

This commit is contained in:

Jonas Bonér 2010-07-28 20:21:59 +02:00

parent f91d39fa8a 2ba8aadb8f

commit da92f4f36d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available