cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/6] git commit: Merge branch 'cassandra-1.1' into trunk
Date Wed, 15 Feb 2012 15:46:32 GMT
Updated Branches:
  refs/heads/trunk ddee43e84 -> 875e05aa9


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 875e05aa99ebe683df0841cbbd2adb5f36072f42
Parents: ddee43e e467533
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Feb 15 16:46:21 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Feb 15 16:46:21 2012 +0100

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/SuperColumn.java  |   28 +++++++++++++++
 src/java/org/apache/cassandra/db/SystemTable.java  |    2 +-
 src/java/org/apache/cassandra/gms/Gossiper.java    |    2 +-
 .../cassandra/io/LazilyCompactedRowTest.java       |   12 +++---
 4 files changed, 36 insertions(+), 8 deletions(-)
----------------------------------------------------------------------



Mime
View raw message