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

kernel/src/main/scala/Kernel.scala

@@ -117,6 +117,7 @@ object Kernel extends Logging {
   private[akka] def startCassandra = if (config.getBool("akka.storage.cassandra.service", true)) {
     System.setProperty("cassandra", "")
     System.setProperty("storage-config", akka.Boot.CONFIG + "/")
+    println("------------------------- " + akka.Boot.CONFIG + "/")
     CassandraStorage.start
   }
 

kernel/src/test/scala/PersistentActorSpec.scala

@@ -59,8 +59,7 @@ class PersistentActor extends Actor {
 object PersistenceManager {
   @volatile var isRunning = false
   def init = if (!isRunning) {
-    System.setProperty("storage-config", "config")
-    Kernel.boot
+    Kernel.startCassandra
     isRunning = true
   }
 }

scripts/compile_etags_file.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-sctags.sh -E -R . -f TAGS
+sctags.bat -E -R . -f TAGS