merge with origin cassandra branch

2009-08-05 15:12:34 +02:00 · 2009-08-05 15:12:34 +02:00 · e11fa7bf33
commit e11fa7bf33
parent ef991baa15 31c48dd320
12 changed files with 457 additions and 83 deletions
--- a/samples-scala/src/main/scala/SimpleService.scala
+++ b/samples-scala/src/main/scala/SimpleService.scala
@ -114,4 +114,4 @@ class JsonpFilter extends BroadcastFilter[String] with Logging {
            message +
     "\" }); \n</script>\n")
  }
-}
+}