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/c770256a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c770256a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c770256a Branch: refs/heads/trunk Commit: c770256a7928448b2257f419917d51e905129d3d Parents: d6f3cdf f302eb7 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Aug 4 14:15:08 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Aug 4 14:15:08 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c770256a/CHANGES.txt ----------------------------------------------------------------------