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/d963e9b2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d963e9b2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d963e9b2 Branch: refs/heads/trunk Commit: d963e9b29917322a1408b77627e20734ef81fbb5 Parents: aca45fe ebd50ff Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Oct 22 17:09:02 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Oct 22 17:09:02 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d963e9b2/CHANGES.txt ----------------------------------------------------------------------