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/a1094419 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1094419 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1094419 Branch: refs/heads/trunk Commit: a109441996e4b9e36a6470120f7b28e800fc37b1 Parents: 986b7a6 c8848bc Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Dec 1 13:45:05 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Dec 1 13:45:05 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------