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/36448a3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36448a3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36448a3b Branch: refs/heads/trunk Commit: 36448a3bb0ed493c884fac75644f7815795b3864 Parents: c2579b9 d66a70e Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu May 1 16:40:35 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu May 1 16:40:35 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------