cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [2/4] git commit: Merge branch 'cassandra-1.2' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2
Date Fri, 18 Jan 2013 18:58:49 GMT
Merge branch 'cassandra-1.2' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26fdab37
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26fdab37
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26fdab37

Branch: refs/heads/trunk
Commit: 26fdab37802fcb6fe7dd875d8366545159d79be7
Parents: 9dcec00 43c9e81
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Jan 18 19:30:08 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Jan 18 19:30:08 2013 +0100

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/SystemTable.java  |   18 ++-----
 src/java/org/apache/cassandra/gms/Gossiper.java    |   12 +++-
 .../apache/cassandra/service/StorageService.java   |   40 ++++++++-------
 .../org/apache/cassandra/db/SystemTableTest.java   |    2 +-
 4 files changed, 37 insertions(+), 35 deletions(-)
----------------------------------------------------------------------



Mime
View raw message