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/f1475244 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1475244 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1475244 Branch: refs/heads/trunk Commit: f1475244f5522ab27f504b5ebb6492b02a7ec9a9 Parents: 3b94548 0757dc7 Author: Brandon Williams <[email protected]> Authored: Mon Jan 12 11:58:03 2015 -0600 Committer: Brandon Williams <[email protected]> Committed: Mon Jan 12 11:58:03 2015 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
