Updated Branches: refs/heads/cassandra-1.2 4df8fdcde -> 43c9e8156 refs/heads/trunk 2226e0c94 -> 689410b89
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/689410b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/689410b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/689410b8 Branch: refs/heads/trunk Commit: 689410b89dfcfe9bbc9baf9ecc441f695272f4e7 Parents: 2226e0c 43c9e81 Author: Brandon Williams <[email protected]> Authored: Fri Jan 18 11:50:21 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Fri Jan 18 11:50:21 2013 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 12 ++++++++-- .../apache/cassandra/service/StorageService.java | 17 +++++++-------- 2 files changed, 17 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/689410b8/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/689410b8/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
