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/834f248d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/834f248d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/834f248d Branch: refs/heads/trunk Commit: 834f248d32892ae059386487375acc830d3822f4 Parents: 51cdeed 9a0ea53 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Mon Jun 30 14:44:53 2014 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Mon Jun 30 14:44:53 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/834f248d/CHANGES.txt ----------------------------------------------------------------------
