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/999a448d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/999a448d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/999a448d Branch: refs/heads/trunk Commit: 999a448d671381978cefe6ff27370a7ae5050374 Parents: 242d54b 6f1b749 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Oct 29 14:01:57 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Oct 29 14:01:57 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------