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/02f58ff1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02f58ff1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02f58ff1 Branch: refs/heads/trunk Commit: 02f58ff13d46a90ab6450ea9d017d0ac88665f77 Parents: 834f248 d213326 Author: Marcus Eriksson <[email protected]> Authored: Mon Jun 30 16:14:23 2014 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Mon Jun 30 16:14:23 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/02f58ff1/CHANGES.txt ----------------------------------------------------------------------
