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/31228677 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31228677 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31228677 Branch: refs/heads/trunk Commit: 3122867720d9075792cba31a5ef8242fdca58527 Parents: 54f728c 7514e61 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Jan 14 21:27:26 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Jan 14 21:27:26 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/31228677/CHANGES.txt ----------------------------------------------------------------------