Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/676099e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/676099e1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/676099e1 Branch: refs/heads/trunk Commit: 676099e1c2b49efa5183d04c1d6163f93a078a10 Parents: d6f9555 1119983 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Jun 26 08:33:04 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Jun 26 08:33:04 2015 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------
