Merge branch 'cassandra-2.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/3b45d004 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b45d004 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b45d004 Branch: refs/heads/trunk Commit: 3b45d004c5966ea26daa8539afc1b6ca6e95bfee Parents: 4620823 e30f111 Author: Sylvain Lebresne <[email protected]> Authored: Mon Feb 24 10:05:54 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Feb 24 10:05:54 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/statements/AlterTableStatement.java | 9 ++++++++- .../cql3/statements/AlterTypeStatement.java | 4 ++++ .../db/composites/AbstractCellNameType.java | 2 +- .../cassandra/db/composites/CellNameType.java | 4 ++-- .../db/composites/CompoundSparseCellNameType.java | 4 ++-- .../apache/cassandra/db/marshal/CollectionType.java | 16 ++++++++++++++++ .../db/marshal/ColumnToCollectionType.java | 3 ++- 8 files changed, 36 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b45d004/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b45d004/src/java/org/apache/cassandra/db/composites/CellNameType.java ----------------------------------------------------------------------
