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/386ed8fa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/386ed8fa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/386ed8fa Branch: refs/heads/trunk Commit: 386ed8fa6c981f144433edc2ab13105734f16fae Parents: 04f74a9 ef08e62 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Apr 2 14:29:10 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Apr 2 14:29:10 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/SuperColumns.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/386ed8fa/CHANGES.txt ----------------------------------------------------------------------
