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/b0590c44 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0590c44 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0590c44 Branch: refs/heads/trunk Commit: b0590c4480dbb5bb05c0ad28e223d20a0d9c9f09 Parents: 886f16c 5c0c84b Author: Jason Brown <jasedbr...@gmail.com> Authored: Thu Oct 17 14:00:33 2013 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Thu Oct 17 14:00:33 2013 -0700 ---------------------------------------------------------------------- ----------------------------------------------------------------------