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/63e0eb4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63e0eb4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63e0eb4f Branch: refs/heads/trunk Commit: 63e0eb4faab4f06181cddd9911db9f7be93a3961 Parents: 2621707 13b753b Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Feb 20 21:13:10 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Feb 20 21:13:10 2014 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/composites/AbstractCType.java | 2 ++ src/java/org/apache/cassandra/db/filter/ColumnSlice.java | 5 +++++ .../org/apache/cassandra/db/marshal/AbstractCompositeType.java | 2 ++ src/java/org/apache/cassandra/db/marshal/LongType.java | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) ----------------------------------------------------------------------