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/2aa83426 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2aa83426 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2aa83426 Branch: refs/heads/cassandra-3.0 Commit: 2aa834265ba76fe0e161ce9fdb612df045dcd576 Parents: d425fe4 4a94f75 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Nov 23 17:14:14 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Nov 23 17:14:14 2015 +0000 ---------------------------------------------------------------------- ----------------------------------------------------------------------