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/adea05f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adea05f5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/adea05f5 Branch: refs/heads/trunk Commit: adea05f58a357fd3b335ae9e7a835411808dfe92 Parents: 6cecbf9 411abc7 Author: Jake Luciani <j...@apache.org> Authored: Wed May 7 14:30:32 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Wed May 7 14:30:32 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------