Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7232783b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7232783b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7232783b Branch: refs/heads/trunk Commit: 7232783bc5ab7134c1698d866ceb9cca330d0441 Parents: 3f00662 294c011 Author: Tyler Hobbs <ty...@datastax.com> Authored: Fri Apr 11 16:43:41 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Fri Apr 11 16:43:41 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7232783b/CHANGES.txt ----------------------------------------------------------------------
