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

2015-12-04 Thread jmckenzie 
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/eb0f56dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb0f56dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb0f56dd

Branch: refs/heads/cassandra-3.1
Commit: eb0f56dd29d9cb9e09b2e41b5385be0626b82e56
Parents: be99f44 69bf1c6
Author: Joshua McKenzie 
Authored: Fri Dec 4 13:40:39 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Dec 4 13:40:39 2015 -0500

--
 src/java/org/apache/cassandra/service/AbstractReadExecutor.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--

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

2015-12-02 Thread yukim 
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/62de5a36
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62de5a36
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62de5a36

Branch: refs/heads/cassandra-3.1
Commit: 62de5a36f17e02c8c0865cc9a6992cc63b58f23c
Parents: 82d5f6a a9a2d75
Author: Yuki Morishita 
Authored: Wed Dec 2 13:52:00 2015 -0600
Committer: Yuki Morishita 
Committed: Wed Dec 2 13:52:00 2015 -0600

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/streaming/StreamReader.java| 4 +---
 .../cassandra/streaming/compress/CompressedStreamReader.java | 4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/62de5a36/CHANGES.txt
--
diff --cc CHANGES.txt
index d7c4eb1,a82dcfc..ad4cd8b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Fix NPE on stream read error (CASSANDRA-10771)
   * Normalize cqlsh DESC output (CASSANDRA-10431)
   * Rejects partition range deletions when columns are specified 
(CASSANDRA-10739)
   * Fix error when saving cached key for old format sstable (CASSANDRA-10778)

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

2015-11-30 Thread samt 
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/5de5d06a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5de5d06a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5de5d06a

Branch: refs/heads/cassandra-3.1
Commit: 5de5d06a47c7f81d52d9ca24928368ada9364bf5
Parents: 918bc01 4c56c89
Author: Sam Tunnicliffe 
Authored: Mon Nov 30 12:19:09 2015 +
Committer: Sam Tunnicliffe 
Committed: Mon Nov 30 12:19:09 2015 +

--
 CHANGES.txt |  2 +-
 .../org/apache/cassandra/config/CFMetaData.java | 14 +++--
 .../org/apache/cassandra/config/Schema.java |  8 +--
 .../apache/cassandra/cql3/QueryProcessor.java   |  4 +-
 .../cassandra/service/MigrationListener.java|  4 +-
 .../cassandra/service/MigrationManager.java |  4 +-
 .../org/apache/cassandra/transport/Server.java  |  2 +-
 .../validation/entities/SecondaryIndexTest.java | 62 +---
 .../index/internal/CassandraIndexTest.java  |  8 ---
 9 files changed, 62 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de5d06a/CHANGES.txt
--
diff --cc CHANGES.txt
index bb1b5d7,0356045..57769db
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,6 @@@
- 
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)
   * Fix SELECT statement with IN restrictions on partition key,
 ORDER BY and LIMIT (CASSANDRA-10729)
   * Improve stress performance over 1k threads (CASSANDRA-7217)

[5/6] 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/trunk
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/6] 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/trunk
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/6] 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/trunk
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/6] 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/trunk
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
--

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

2015-11-13 Thread jmckenzie 
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/88892af9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88892af9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88892af9

Branch: refs/heads/cassandra-3.1
Commit: 88892af934af23fa15571e165c79446d3ef1bd43
Parents: f92f69c 3223927
Author: Joshua McKenzie 
Authored: Fri Nov 13 10:03:45 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 10:03:45 2015 -0500

--
 src/java/org/apache/cassandra/db/lifecycle/LogFile.java   | 7 ---
 .../org/apache/cassandra/db/lifecycle/LogTransaction.java | 6 ++
 2 files changed, 6 insertions(+), 7 deletions(-)
--

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

2015-11-13 Thread samt 
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/00c31a24
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00c31a24
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00c31a24

Branch: refs/heads/cassandra-3.1
Commit: 00c31a24cb78d98ffc075bd0dcca0b3c6e6a705e
Parents: 88892af 5730e7b
Author: Sam Tunnicliffe 
Authored: Fri Nov 13 17:50:57 2015 +
Committer: Sam Tunnicliffe 
Committed: Fri Nov 13 17:50:57 2015 +

--
 CHANGES.txt |  1 +
 .../cassandra/index/SecondaryIndexManager.java  |  7 -
 .../apache/cassandra/index/CustomIndexTest.java | 33 
 3 files changed, 40 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/00c31a24/CHANGES.txt
--
diff --cc CHANGES.txt
index cd78818,f214200..6aff321
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
   * Keep the file open in trySkipCache (CASSANDRA-10669)
   * Updated trigger example (CASSANDRA-10257)
  Merged from 2.2: