Updated Branches: refs/heads/cassandra-1.1 dbf99d674 -> fa8fc22fc
merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa8fc22f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa8fc22f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa8fc22f Branch: refs/heads/cassandra-1.1 Commit: fa8fc22fca240e1f016bbfd5ff9c54b57c0bb777 Parents: dbf99d6 ec76baf Author: Dave Brosius <dbros...@apache.org> Authored: Fri Aug 24 00:00:59 2012 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Fri Aug 24 00:00:59 2012 -0400 ---------------------------------------------------------------------- .../cassandra/service/AntiEntropyService.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa8fc22f/src/java/org/apache/cassandra/service/AntiEntropyService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/AntiEntropyService.java index d76d26f,7bdeb20..0d7c1b4 --- a/src/java/org/apache/cassandra/service/AntiEntropyService.java +++ b/src/java/org/apache/cassandra/service/AntiEntropyService.java @@@ -418,7 -412,7 +418,7 @@@ public class AntiEntropyServic { try { -- FastByteArrayOutputStream bos = new FastByteArrayOutputStream(); ++ FastByteArrayOutputStream bos = new FastByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(bos); SERIALIZER.serialize(request, dos, version); return new Message(FBUtilities.getBroadcastAddress(), StorageService.Verb.TREE_REQUEST, bos.toByteArray(), version); @@@ -490,7 -484,7 +490,7 @@@ { try { -- FastByteArrayOutputStream bos = new FastByteArrayOutputStream(); ++ FastByteArrayOutputStream bos = new FastByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(bos); SERIALIZER.serialize(validator, dos, Gossiper.instance.getVersion(validator.request.endpoint)); return new Message(local,