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/442f3025 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/442f3025 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/442f3025 Branch: refs/heads/trunk Commit: 442f3025e57c2bc701377819183627b0818ab68f Parents: 4b02879 fc59801 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue May 13 11:00:02 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue May 13 11:00:02 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 101 +++++++++++++++++++++++++++---------------------------- 1 file changed, 49 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/442f3025/CHANGES.txt ----------------------------------------------------------------------