[04/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2016-08-02 Thread stefania 
Merge branch 'cassandra-2.2' into cassandra-3.0

* cassandra-2.2:
  Revert CASSANDRA-11427 because of CASSANDRA-12351 (CASSANDRA-12143).


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5acfce66
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5acfce66
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5acfce66

Branch: refs/heads/trunk
Commit: 5acfce66601c76cc280e2a05562415948bd3a538
Parents: c6cb31e f28631e
Author: Sylvain Lebresne 
Authored: Tue Aug 2 15:54:55 2016 +0200
Committer: Sylvain Lebresne 
Committed: Tue Aug 2 15:54:55 2016 +0200

--

--

[04/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2016-03-07 Thread jasobrown 
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/8e9622a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e9622a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e9622a1

Branch: refs/heads/cassandra-3.0
Commit: 8e9622a1198a0758f3290a5fc655adcca7d10599
Parents: 9c3855b a956e9f
Author: Jason Brown 
Authored: Mon Mar 7 05:29:23 2016 -0800
Committer: Jason Brown 
Committed: Mon Mar 7 05:29:23 2016 -0800

--

--