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/30513294 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30513294 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30513294 Branch: refs/heads/trunk Commit: 305132946d20c7c2e81f2eb80da50f7131031061 Parents: b47d8a8 a9da3fd Author: Brandon Williams <[email protected]> Authored: Fri Jun 13 13:36:01 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Jun 13 13:36:01 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
