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/aae8d8cc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aae8d8cc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aae8d8cc Branch: refs/heads/trunk Commit: aae8d8cc7491d5f255c876668939a7a46b51bf76 Parents: 754643c 3d62a55 Author: Brandon Williams <[email protected]> Authored: Tue May 6 11:37:53 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue May 6 11:37:53 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 6 +++++- NEWS.txt | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aae8d8cc/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aae8d8cc/NEWS.txt ----------------------------------------------------------------------
