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/59695a25 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59695a25 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59695a25 Branch: refs/heads/trunk Commit: 59695a2541dcc088f3cac1ddb4b65143615a068f Parents: 79e3217 74ac6e8 Author: Marcus Eriksson <[email protected]> Authored: Fri Mar 14 18:54:19 2014 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Fri Mar 14 18:54:19 2014 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------
