Updated Branches:
refs/heads/cassandra-1.1 10b3dcc96 -> e46753381
Merge branch 'cassandra-1.0' into cassandra-1.1
Conflicts:
src/java/org/apache/cassandra/cql/QueryProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4675338
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4675338
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4675338
Branch: refs/heads/cassandra-1.1
Commit: e467533816409e2446de1197260623461614481d
Parents: 10b3dcc 636e41d
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Wed Feb 15 16:45:19 2012 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Wed Feb 15 16:45:19 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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4675338/src/java/org/apache/cassandra/db/SuperColumn.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4675338/src/java/org/apache/cassandra/db/SystemTable.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4675338/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
