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/c65973d2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c65973d2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c65973d2 Branch: refs/heads/trunk Commit: c65973d2d18abce7b076db4f0f6564f02b9c9242 Parents: e100288 22d86eb Author: Dave Brosius <[email protected]> Authored: Fri Apr 18 19:53:17 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Fri Apr 18 19:53:17 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c65973d2/CHANGES.txt ----------------------------------------------------------------------
