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/c7ecd4a6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7ecd4a6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7ecd4a6 Branch: refs/heads/trunk Commit: c7ecd4a6c5bc76e92676c92a491f720680891168 Parents: 0d815af 54b2418 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Jun 6 01:12:02 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Jun 6 01:12:02 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7ecd4a6/CHANGES.txt ----------------------------------------------------------------------