[08/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[yukim]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: e7c19c609a8d708cd3b36d80ff44376f3a7554a8
Parents: 92cb311 e63c7a0
Author: Yuki Morishita 
Authored: Mon Jan 16 10:35:35 2017 -0600
Committer: Yuki Morishita 
Committed: Mon Jan 16 10:35:35 2017 -0600

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/db/UnfilteredDeserializer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7c19c60/CHANGES.txt
--
diff --cc CHANGES.txt
index f1343b8,9c0b51b..3a0c78d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -132,8 -111,8 +132,9 @@@
   * Restore resumable hints delivery (CASSANDRA-11960)
   * Properly report LWT contention (CASSANDRA-12626)
  Merged from 3.0:
+  * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
   * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
   * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
   * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
   * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)

[08/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[stefania]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 4fefdee591b21b375735c9dc26e9f1ed916204de
Parents: a90b3fe ad8c236
Author: Stefania Alborghetti 
Authored: Fri Jan 6 10:05:00 2017 +0100
Committer: Stefania Alborghetti 
Committed: Fri Jan 6 10:05:00 2017 +0100

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/copyutil.py | 7 +++
 2 files changed, 8 insertions(+)
--


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[stefania]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 342e28f695294a2afdde4fbe4faa42f8c0ebad76
Parents: 04ee4cc e043d7d
Author: Stefania Alborghetti 
Authored: Wed Jan 4 08:08:31 2017 +0100
Committer: Stefania Alborghetti 
Committed: Wed Jan 4 08:08:31 2017 +0100

--

--

[08/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[carl]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: ddefb1d895f71060236f31cd1e91168d35e436d4
Parents: 707c364 1cafc3c
Author: Carl Yeksigian 
Authored: Tue Dec 13 12:29:11 2016 -0500
Committer: Carl Yeksigian 
Committed: Tue Dec 13 12:29:11 2016 -0500

--
 CHANGES.txt |  1 +
 .../cassandra/service/StorageService.java   | 24 ++--
 2 files changed, 23 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddefb1d8/src/java/org/apache/cassandra/service/StorageService.java
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[jasobrown]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 55adebe665e6e1ce7f40d2cefde48b5b167b8394
Parents: ee0b743 30e154d
Author: Jason Brown 
Authored: Tue Dec 13 05:10:23 2016 -0800
Committer: Jason Brown 
Committed: Tue Dec 13 05:11:29 2016 -0800

--
 CHANGES.txt   | 1 +
 .../apache/cassandra/io/sstable/metadata/MetadataCollector.java   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[jasobrown]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: ee0b743859c2282f5a6c0c94fb6e4c8983452fd7
Parents: 6459f5a 773dfc4
Author: Jason Brown 
Authored: Tue Dec 13 04:34:59 2016 -0800
Committer: Jason Brown 
Committed: Tue Dec 13 04:35:31 2016 -0800

--
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
--


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[jasobrown]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 58a29302cf43f6b6cf961eac059eac62c932116d
Parents: e303863 88c5956
Author: Jason Brown 
Authored: Mon Dec 12 16:45:04 2016 -0800
Committer: Jason Brown 
Committed: Mon Dec 12 16:45:20 2016 -0800

--
 test/unit/org/apache/cassandra/hints/HintsBufferPoolTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[snazy]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: e3038632580314dfbad057d1d709381636798c84
Parents: 8d1c33f 50a9b1a
Author: Robert Stupp 
Authored: Mon Dec 12 20:39:55 2016 +0100
Committer: Robert Stupp 
Committed: Mon Dec 12 20:39:55 2016 +0100

--
 CHANGES.txt |  1 +
 .../concurrent/NamedThreadFactory.java  | 22 +-
 .../AbstractCommitLogSegmentManager.java|  3 +-
 .../db/commitlog/AbstractCommitLogService.java  |  3 +-
 .../cassandra/index/sasi/TermIterator.java  |  3 +-
 .../cassandra/net/OutboundTcpConnection.java| 42 ++--
 .../apache/cassandra/repair/RepairRunnable.java |  4 +-
 .../scheduler/RoundRobinScheduler.java  | 12 +++---
 .../cassandra/service/StorageService.java   |  7 ++--
 9 files changed, 58 insertions(+), 39 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3038632/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3038632/src/java/org/apache/cassandra/service/StorageService.java
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[stefania]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 84b2e73c65287a099c4b21884cb12c82fa5568a9
Parents: 4901e4b 4626b4c
Author: Stefania Alborghetti 
Authored: Mon Dec 12 10:36:22 2016 +0800
Committer: Stefania Alborghetti 
Committed: Mon Dec 12 10:36:22 2016 +0800

--
 CHANGES.txt |  2 ++
 src/java/org/apache/cassandra/gms/Gossiper.java |  1 +
 .../cassandra/service/StorageService.java   | 26 +++-
 3 files changed, 28 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b2e73c/src/java/org/apache/cassandra/service/StorageService.java
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[blambov]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 5439d94c546331b30acf0d43a503e9426364e81a
Parents: 838a21d 2f268ed
Author: Branimir Lambov 
Authored: Tue Dec 6 12:13:23 2016 +0200
Committer: Branimir Lambov 
Committed: Tue Dec 6 12:14:24 2016 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 41 
 .../apache/cassandra/index/CustomIndexTest.java | 37 ++
 3 files changed, 55 insertions(+), 24 deletions(-)
--


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[slebresne]

Merge branch 'cassandra-3.11' into cassandra-3.X

* cassandra-3.11:
  Reject default_time_to_live option when creating or altering MVs


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

Branch: refs/heads/cassandra-3.X
Commit: 918a062122d108f7f8055cf287b2508e70d38e7a
Parents: 36a3ba0 a06b469
Author: Sylvain Lebresne 
Authored: Mon Dec 5 12:11:33 2016 +0100
Committer: Sylvain Lebresne 
Committed: Mon Dec 5 12:11:33 2016 +0100

--
 CHANGES.txt |  4 ++
 NEWS.txt|  9 +
 .../cql3/statements/AlterViewStatement.java |  8 
 .../cql3/statements/CreateViewStatement.java| 11 -
 .../org/apache/cassandra/cql3/ViewTest.java | 42 
 5 files changed, 73 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/918a0621/CHANGES.txt
--
diff --cc CHANGES.txt
index b75a1e4,e69a67a..5a3fedf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,7 +1,13 @@@
 +3.12
 + * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
 + * cqlsh auto completion: refactor definition of compaction strategy options 
(CASSANDRA-12946)
 + * Add support for arithmetic operators (CASSANDRA-11935)
 + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 +
+ 3.11
+ Merged from 3.0:
+  * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
+ 
  3.10
   * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
   * Remove timing window in test case (CASSANDRA-12875)

[08/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[jjirsa]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 49ac804057aab271c2b3aba1d3f2daa9d28f8937
Parents: 0e35799 b63c03b
Author: Jeff Jirsa 
Authored: Fri Dec 2 22:34:57 2016 -0800
Committer: Jeff Jirsa 
Committed: Fri Dec 2 22:35:24 2016 -0800

--
 CHANGES.txt  | 1 +
 bin/nodetool | 2 ++
 2 files changed, 3 insertions(+)
--


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[marcuse]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: dfcd06dda9383ca3a49a4ed1770b10673c63071c
Parents: 2ff97fe ea69be6
Author: Marcus Eriksson 
Authored: Wed Nov 30 14:31:16 2016 +0100
Committer: Marcus Eriksson 
Committed: Wed Nov 30 14:31:16 2016 +0100

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/db/Memtable.java  |  4 -
 .../db/partitions/AtomicBTreePartition.java | 20 -
 .../apache/cassandra/utils/memory/HeapPool.java | 84 ++--
 .../utils/memory/MemtableAllocator.java | 36 -
 .../cassandra/utils/memory/NativeAllocator.java |  6 --
 .../cassandra/utils/memory/SlabAllocator.java   |  5 --
 .../org/apache/cassandra/tools/ToolsTester.java |  2 +-
 8 files changed, 26 insertions(+), 132 deletions(-)
--


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