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

This commit is contained in:
Debasish Ghosh 2011-06-15 17:22:07 +05:30
commit 217b5adba1

View file

@ -138,9 +138,8 @@ akka {
}
}
# entries for pluggable serializers and their bindings
# if a binding for a specific class is not found, then the default
# serializer is used
# Entries for pluggable serializers and their bindings. If a binding for a specific class is not found,
# then the default serializer (Java serialization) is used.
#
# serializers {
# java = "akka.serialization.JavaSerializer"
@ -150,9 +149,13 @@ akka {
# }
# serialization-bindings {
# java = ["akka.serialization.SerializeSpec$Address", "akka.serialization.MyJavaSerializableActor", "akka.serialization.MyStatelessActorWithMessagesInMailbox", "akka.serialization.MyActorWithProtobufMessagesInMailbox"]
# java = ["akka.serialization.SerializeSpec$Address",
# "akka.serialization.MyJavaSerializableActor",
# "akka.serialization.MyStatelessActorWithMessagesInMailbox",
# "akka.serialization.MyActorWithProtobufMessagesInMailbox"]
# sjson = ["akka.serialization.SerializeSpec$Person"]
# proto = ["com.google.protobuf.Message", "akka.actor.ProtobufProtocol$MyMessage"]
# proto = ["com.google.protobuf.Message",
# "akka.actor.ProtobufProtocol$MyMessage"]
# }
}