Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca00f622 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca00f622 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca00f622 Branch: refs/heads/trunk Commit: ca00f622a5dcf899271d80076066ace3949a7e73 Parents: 300b026 2103646 Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Feb 6 18:05:46 2014 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Feb 6 18:05:46 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca00f622/CHANGES.txt ----------------------------------------------------------------------
