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

Merge commit '38e8bea3fe'

Browse source 
Conflicts:
	akka-core/src/main/scala/actor/ActorRef.scala
	akka-core/src/test/java/se/scalablesolutions/akka/actor/ActiveObjectFailer.java
	akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/RemoteSupervisorSpec.scala
	akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/SupervisorSpec.scala
	akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
This commit is contained in:
Jonas Bonér 2010-07-01 17:21:17 +02:00
commit 1a7d7966c0
6 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
View file

@ -19,9 +19,15 @@ import se.scalablesolutions.akka.actor._
/*
@RunWith(classOf[JUnitRunner])
class TransactionalActiveObjectSpec extends
<<<<<<< HEAD:akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
Spec with
ShouldMatchers with
BeforeAndAfterAll {
=======
Spec with
ShouldMatchers with
BeforeAndAfterAll {
>>>>>>> 38e8bea3fe6a7e9fcc9c5f353124144739bdc234:akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
private val conf = new ActiveObjectConfigurator
private var messageLog = ""