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

Merge branch 'master' into new_master

Browse source
This commit is contained in:
Viktor Klang 2010-09-22 16:05:34 +02:00
commit fd2be7c6bb
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-persistence/akka-persistence-hbase/src/main/scala/HbaseStorageBackend.scala
View file

@ -26,7 +26,7 @@ import org.apache.hadoop.hbase.util.Bytes
private[akka] object HbaseStorageBackend extends MapStorageBackend[Array[Byte], Array[Byte]] with VectorStorageBackend[Array[Byte]] with RefStorageBackend[Array[Byte]] with Logging {
val EMPTY_BYTE_ARRAY = new Array[Byte](0)
val HBASE_ZOOKEEPER_QUORUM = config.getString("akka.storage.hbase.zookeeper.quorum", "localhost")
val HBASE_ZOOKEEPER_QUORUM = config.getString("akka.storage.hbase.zookeeper-quorum", "localhost")
val CONFIGURATION = new HBaseConfiguration
val REF_TABLE_NAME = "__REF_TABLE"
val VECTOR_TABLE_NAME = "__VECTOR_TABLE"

2
akka-persistence/akka-persistence-hbase/src/test/scala/SimpleHbaseTest.scala
View file

@ -48,7 +48,7 @@ class PersistenceSpec extends Spec with BeforeAndAfterAll with ShouldMatchers {
import org.apache.hadoop.hbase.client.HBaseAdmin
import org.apache.hadoop.hbase.client.HTable
val HBASE_ZOOKEEPER_QUORUM = config.getString("akka.storage.hbase.zookeeper.quorum", "0")
val HBASE_ZOOKEEPER_QUORUM = config.getString("akka.storage.hbase.zookeeper-quorum", "0")
HBASE_ZOOKEEPER_QUORUM should not equal ("0")
HBASE_ZOOKEEPER_QUORUM should equal("localhost")

2
config/akka-reference.conf
View file

@ -166,7 +166,7 @@ akka {
}
hbase {
zookeeper.quorum = "localhost"
zookeeper-quorum = "localhost"
}
}
}