[5/5] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.1

2015-11-27 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.1


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

Branch: refs/heads/cassandra-3.1
Commit: 41f3cad489d7329fb6a4b8f4edd5aa4392327504
Parents: 442d4c9 7b430ee
Author: Benjamin Lerer 
Authored: Fri Nov 27 11:17:22 2015 +0100
Committer: Benjamin Lerer 
Committed: Fri Nov 27 11:17:35 2015 +0100

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/ReadCommand.java|  9 +-
 .../index/IndexNotAvailableException.java   | 34 
 .../cassandra/index/SecondaryIndexManager.java  | 64 +++---
 .../index/internal/CassandraIndex.java  |  6 +-
 .../cassandra/net/MessageDeliveryTask.java  |  7 +-
 .../validation/entities/SecondaryIndexTest.java | 88 
 .../index/internal/CustomCassandraIndex.java|  4 +-
 8 files changed, 178 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/41f3cad4/CHANGES.txt
--

[5/5] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.1

2015-11-24 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.1


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

Branch: refs/heads/cassandra-3.1
Commit: 521cc542583f8c2c8f8800f19178a0c12645f667
Parents: c37dbdb 29b988d
Author: Benjamin Lerer 
Authored: Tue Nov 24 15:11:42 2015 +0100
Committer: Benjamin Lerer 
Committed: Tue Nov 24 15:11:48 2015 +0100

--
 bin/cqlsh.py | 57 ---
 1 file changed, 33 insertions(+), 24 deletions(-)
--

[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

2015-11-20 Thread slebresne 
Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/cassandra-3.1
Commit: 4b364ecbaa1fd860c0d4f2e7fe36ad4b8eac8c80
Parents: 1c252b9 8475042
Author: Sylvain Lebresne 
Authored: Fri Nov 20 15:12:38 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 20 15:12:38 2015 +0100

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 ++--
 2 files changed, 23 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b364ecb/CHANGES.txt
--

[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

2015-11-17 Thread marcuse 
Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/cassandra-3.1
Commit: 798a7a8fe8e7f28605341ebabc538908c3ff8dba
Parents: 36e7677 eb8afb7
Author: Marcus Eriksson 
Authored: Tue Nov 17 10:13:33 2015 +0100
Committer: Marcus Eriksson 
Committed: Tue Nov 17 10:13:33 2015 +0100

--
 CHANGES.txt   |  2 ++
 .../cassandra/repair/messages/RepairOption.java   | 18 +++---
 .../cassandra/service/ActiveRepairService.java|  2 ++
 .../apache/cassandra/service/StorageService.java  |  9 +++--
 .../repair/messages/RepairOptionTest.java | 17 +++--
 5 files changed, 41 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/798a7a8f/CHANGES.txt
--