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/b557f7e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b557f7e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b557f7e3 Branch: refs/heads/trunk Commit: b557f7e3756e18591e78d791178288e463f17669 Parents: 21ab8f8 102c3c1 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Oct 8 12:04:56 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Oct 8 12:04:56 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
