Merge branch 'master' of git@github.com:jboner/akka

Conflicts:
	akka-persistence/akka-persistence-common/src/main/scala/Storage.scala
This commit is contained in:
Jonas Bonér 2010-10-06 12:12:45 +02:00
commit 1000db8708
21 changed files with 1303 additions and 298 deletions

View file

@ -595,7 +595,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
val dbcp = Dependencies.dbcp
val sjson = Dependencies.sjson_test
override def testOptions = createTestFilter( _.endsWith("Suite"))
override def testOptions = createTestFilter({ s:String=> s.endsWith("Suite") || s.endsWith("Test")})
}