Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13b753b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13b753b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13b753b0 Branch: refs/heads/trunk Commit: 13b753b0169aa668c8c6091d68705a4034f7cdd4 Parents: 76e5c93 edf16c9 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Feb 20 21:11:55 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Feb 20 21:11:55 2014 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/db/marshal/AbstractCompositeType.java | 2 ++ src/java/org/apache/cassandra/db/marshal/LongType.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13b753b0/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java ----------------------------------------------------------------------
