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/96171d36 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96171d36 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96171d36 Branch: refs/heads/trunk Commit: 96171d36bffa4fc55835295d2332b948614c3d71 Parents: f987e36 8465a91 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Tue May 20 00:12:50 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Tue May 20 00:12:50 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
