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/2fe5b9a8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fe5b9a8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fe5b9a8 Branch: refs/heads/trunk Commit: 2fe5b9a82dde6ce35128e1cf258d68128b1769c6 Parents: a848b08 f92a457 Author: Jonathan Ellis <[email protected]> Authored: Thu Oct 9 07:26:03 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Oct 9 07:26:03 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fe5b9a8/CHANGES.txt ----------------------------------------------------------------------
