You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/02/08 15:39:44 UTC

[1/6] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches:
  refs/heads/trunk f297f54ed -> f1e127d92


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/f1e127d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1e127d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1e127d9

Branch: refs/heads/trunk
Commit: f1e127d920c9b50cbc48490c10ec8966c99398d0
Parents: f297f54 1616f3f
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 8 15:39:29 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 8 15:39:29 2012 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |   15 +------
 .../apache/cassandra/cql/AlterTableStatement.java  |   31 ++++++++-----
 .../cql3/statements/AlterTableStatement.java       |    2 +
 src/java/org/apache/cassandra/db/Column.java       |    5 ++
 .../org/apache/cassandra/db/ColumnFamilyStore.java |    2 +-
 src/java/org/apache/cassandra/db/IColumn.java      |    1 +
 src/java/org/apache/cassandra/db/SuperColumn.java  |   15 ++++++-
 .../apache/cassandra/db/filter/QueryFilter.java    |    2 +-
 .../apache/cassandra/db/RemoveSubColumnTest.java   |   34 +++++++++++++++
 9 files changed, 79 insertions(+), 28 deletions(-)
----------------------------------------------------------------------