Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9b93c25 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9b93c25 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9b93c25 Branch: refs/heads/trunk Commit: a9b93c257304a4bf76f301d483e3264fba934f80 Parents: b171148 d16d5c4 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Dec 13 00:46:57 2013 +0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Dec 13 00:46:57 2013 +0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
