Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c840c0c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c840c0c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c840c0c Branch: refs/heads/cassandra-3.0 Commit: 6c840c0cd102c2bfc5e09c68673c03356f9a78fb Parents: 8bb5f1e 868be9c Author: Stefan Podkowinski <s.podkowin...@gmail.com> Authored: Wed Apr 26 19:46:56 2017 +0200 Committer: Stefan Podkowinski <s.podkowin...@gmail.com> Committed: Wed Apr 26 19:46:56 2017 +0200 ---------------------------------------------------------------------- redhat/cassandra | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) ----------------------------------------------------------------------