Updated Branches: refs/heads/cassandra-1.2 8349fcebf -> 945853076 refs/heads/trunk 549655f28 -> 3d1b85817
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d1b8581 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d1b8581 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d1b8581 Branch: refs/heads/trunk Commit: 3d1b858173b681b33349538f33734ca3e427f673 Parents: 549655f 9458530 Author: Brandon Williams <[email protected]> Authored: Tue Jan 8 13:26:01 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Jan 8 13:26:01 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 5 ++ .../apache/cassandra/service/StorageService.java | 39 ++++++--------- 3 files changed, 22 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d1b8581/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d1b8581/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d1b8581/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
