Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60079af6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60079af6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60079af6 Branch: refs/heads/trunk Commit: 60079af67ddfdf2528d205f36f62667a4fc6aa73 Parents: 05b2ae8 3ca7401 Author: Brandon Williams <[email protected]> Authored: Wed Apr 2 16:55:29 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Apr 2 16:55:29 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
