subject:"\[3\/3\] cassandra git commit\: Merge branch 'cassandra\-3.X' into trunk"

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2017-01-05 Thread dikang

Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  Use new token allocation for non bootstrap case as well.


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

Branch: refs/heads/trunk
Commit: d384e781d6f7c028dbe88cfe9dd3e966e72cd046
Parents: 3d90bb0 5f3b359
Author: Dikang Gu 
Authored: Thu Jan 5 12:11:58 2017 -0800
Committer: Dikang Gu 
Committed: Thu Jan 5 12:13:29 2017 -0800

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/dht/BootStrapper.java  | 18 +++--
 .../dht/tokenallocator/TokenAllocation.java |  3 -
 .../cassandra/service/StorageService.java   | 69 +---
 .../apache/cassandra/dht/BootStrapperTest.java  |  2 +-
 5 files changed, 48 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d384e781/CHANGES.txt
--
diff --cc CHANGES.txt
index 08eed35,cacb7cd..8f625db
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 +4.0
 + * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855)
 + * Thrift removal (CASSANDRA-5)
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.12
+  * Use new token allocation for non bootstrap case as well (CASSANDRA-13080)
   * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084)
   * More fixes to the TokenAllocator (CASSANDRA-12990)
   * Require forceful decommission if number of nodes is less than replication 
factor (CASSANDRA-12510)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d384e781/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2017-01-03 Thread jasobrown

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: b137bd9778ca51cc30d2cfa290489b776951ca71
Parents: 87b1bb8 3f1a3b2
Author: Jason Brown 
Authored: Tue Jan 3 14:02:56 2017 -0800
Committer: Jason Brown 
Committed: Tue Jan 3 14:03:55 2017 -0800

--
 CHANGES.txt|  1 +
 .../cassandra/io/sstable/format/SSTableReader.java | 13 +++--
 .../io/sstable/format/big/BigTableReader.java  |  4 +---
 3 files changed, 13 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b137bd97/CHANGES.txt
--
diff --cc CHANGES.txt
index a564bc9,9ed66fd..08eed35
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 +4.0
 + * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855)
 + * Thrift removal (CASSANDRA-5)
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.12
 - * Avoid byte-array copy when key cache is disabled (CASANDRA-13084)
++ * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084)
   * More fixes to the TokenAllocator (CASSANDRA-12990)
   * Require forceful decommission if number of nodes is less than replication 
factor (CASSANDRA-12510)
   * Allow IN restrictions on column families with collections (CASSANDRA-12654)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b137bd97/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b137bd97/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-27 Thread dikang

Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  More fixes to the TokenAllocation


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

Branch: refs/heads/trunk
Commit: 88b7126a177a77e28b34384e7792d4b4394cb55f
Parents: 55fe548 4aa09eb
Author: Dikang Gu 
Authored: Tue Dec 27 10:51:58 2016 -0800
Committer: Dikang Gu 
Committed: Tue Dec 27 10:53:05 2016 -0800

--
 CHANGES.txt |  1 +
 .../dht/tokenallocator/TokenAllocation.java | 30 
 .../tokenallocator/TokenAllocatorFactory.java   |  2 +-
 src/java/org/apache/cassandra/gms/Gossiper.java | 45 ++
 .../cassandra/service/CassandraDaemon.java  | 48 +---
 5 files changed, 78 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b7126a/CHANGES.txt
--
diff --cc CHANGES.txt
index b412f11,e9dc503..ba0e3f1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 +4.0
 + * Thrift removal (CASSANDRA-5)
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.12
+  * More fixes to the TokenAllocator (CASSANDRA-12990)
   * Require forceful decommission if number of nodes is less than replication 
factor (CASSANDRA-12510)
   * Allow IN restrictions on column families with collections (CASSANDRA-12654)
   * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b7126a/src/java/org/apache/cassandra/gms/Gossiper.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b7126a/src/java/org/apache/cassandra/service/CassandraDaemon.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-23 Thread paulo

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 55fe548f6f677e015adebb3f81bc549a8f9b9dc1
Parents: d4fd04e 39d77f4
Author: Paulo Motta 
Authored: Fri Dec 23 21:28:36 2016 -0200
Committer: Paulo Motta 
Committed: Fri Dec 23 21:28:36 2016 -0200

--
 CHANGES.txt |  1 +
 .../cassandra/service/StorageService.java   | 55 +++-
 .../cassandra/service/StorageServiceMBean.java  |  3 +-
 .../org/apache/cassandra/tools/NodeProbe.java   |  4 +-
 .../cassandra/tools/nodetool/Decommission.java  |  9 +++-
 5 files changed, 56 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/55fe548f/CHANGES.txt
--
diff --cc CHANGES.txt
index 16d7dc6,c5fcec8..b412f11
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 +4.0
 + * Thrift removal (CASSANDRA-5)
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.12
+  * Require forceful decommission if number of nodes is less than replication 
factor (CASSANDRA-12510)
   * Allow IN restrictions on column families with collections (CASSANDRA-12654)
   * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
   * nodetool stopdaemon errors out (CASSANDRA-13030)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/55fe548f/src/java/org/apache/cassandra/service/StorageServiceMBean.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/55fe548f/src/java/org/apache/cassandra/tools/NodeProbe.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-22 Thread dbrosius

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: da4147628d33b6e3dc2c43b0d3f762e7fa52c760
Parents: 187636c 0d4fdad
Author: Dave Brosius 
Authored: Thu Dec 22 20:20:58 2016 -0500
Committer: Dave Brosius 
Committed: Thu Dec 22 20:20:58 2016 -0500

--
 src/java/org/apache/cassandra/index/SecondaryIndexManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-14 Thread jmckenzie

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: dad5b96ecfaa739f1a26e1df117c33046fa27dbf
Parents: 0c56d6c 83ba3b7
Author: Joshua McKenzie 
Authored: Wed Dec 14 15:12:57 2016 -0500
Committer: Joshua McKenzie 
Committed: Wed Dec 14 15:12:57 2016 -0500

--
 src/java/org/apache/cassandra/db/Mutation.java | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dad5b96e/src/java/org/apache/cassandra/db/Mutation.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-13 Thread snazy

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: d596a47cf1d2aaa8d1b4e98f886e0042a62cb9af
Parents: 4489ee8 707c364
Author: Robert Stupp 
Authored: Tue Dec 13 17:38:18 2016 +0100
Committer: Robert Stupp 
Committed: Tue Dec 13 17:38:18 2016 +0100

--
 CHANGES.txt |  1 +
 .../concurrent/NamedThreadFactory.java  | 42 -
 .../functions/ThreadAwareSecurityManager.java   |  3 +-
 .../AbstractCommitLogSegmentManager.java|  2 +-
 .../db/commitlog/AbstractCommitLogService.java  |  2 +-
 .../db/compaction/CompactionManager.java|  3 +-
 .../apache/cassandra/db/marshal/AsciiType.java  |  3 +-
 .../hints/EncryptedChecksummedDataInput.java|  3 +-
 .../cassandra/index/sasi/TermIterator.java  |  5 +-
 .../io/compress/DeflateCompressor.java  | 11 +--
 .../cassandra/net/OutboundTcpConnection.java|  5 +-
 .../apache/cassandra/repair/RepairRunnable.java |  6 +-
 .../cassandra/security/CipherFactory.java   |  3 +-
 .../cassandra/security/EncryptionUtils.java |  3 +-
 .../serializers/TimestampSerializer.java|  7 +-
 .../cassandra/service/StorageService.java   |  8 +-
 .../cassandra/utils/CoalescingStrategies.java   | 25 +++---
 .../org/apache/cassandra/utils/FBUtilities.java | 15 ++--
 .../org/apache/cassandra/cql3/ViewLongTest.java |  3 +-
 .../test/microbench/FastThreadExecutor.java | 65 +-
 .../test/microbench/FastThreadLocalBench.java   | 92 
 .../cassandra/cache/CacheProviderTest.java  |  3 +-
 .../cassandra/concurrent/WaitQueueTest.java |  4 +-
 .../cassandra/db/RecoveryManagerTest.java   | 22 +++--
 .../apache/cassandra/hints/HintsBufferTest.java |  3 +-
 .../io/sstable/IndexSummaryManagerTest.java |  3 +-
 .../io/sstable/SSTableRewriterTest.java |  5 +-
 .../apache/cassandra/service/RemoveTest.java| 26 +++---
 .../apache/cassandra/utils/TopKSamplerTest.java |  5 +-
 .../apache/cassandra/stress/StressServer.java   |  6 +-
 .../operations/userdefined/TokenRangeQuery.java |  3 +-
 31 files changed, 234 insertions(+), 153 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d596a47c/CHANGES.txt
--
diff --cc CHANGES.txt
index fa81b5f,2c95d50..1f18fd9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 +4.0
 + * Thrift removal (CASSANDRA-5)
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.12
+  * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
   * nodetool stopdaemon errors out (CASSANDRA-13030)
   * Log message size in trace message in OutboundTcpConnection 
(CASSANDRA-13028)
   * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d596a47c/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d596a47c/test/long/org/apache/cassandra/cql3/ViewLongTest.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d596a47c/test/unit/org/apache/cassandra/cache/CacheProviderTest.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d596a47c/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d596a47c/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/TokenRangeQuery.java

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-12 Thread jasobrown

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: a92ca615487e0915723cba4ffe3a070afa88cdfe
Parents: 5364310 8d1c33f
Author: Jason Brown 
Authored: Mon Dec 12 10:41:25 2016 -0800
Committer: Jason Brown 
Committed: Mon Dec 12 10:42:05 2016 -0800

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java | 2 ++
 2 files changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a92ca615/CHANGES.txt
--
diff --cc CHANGES.txt
index 5d93b8a,7a7f21c..f59f89f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +4.0
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.12
+  * nodetool stopdaemon errors out (CASSANDRA-13030)
   * Log message size in trace message in OutboundTcpConnection 
(CASSANDRA-13028)
   * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
   * Add mutation size and batch metrics (CASSANDRA-12649)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-12 Thread jasobrown

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 5364310bf819971bc4605f92d4787636d7f839da
Parents: 9c0fa05 07f990b
Author: Jason Brown 
Authored: Mon Dec 12 10:30:50 2016 -0800
Committer: Jason Brown 
Committed: Mon Dec 12 10:31:48 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5364310b/CHANGES.txt
--
diff --cc CHANGES.txt
index 6e57ea7,ed0fc14..5d93b8a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +4.0
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.12
+  * Log message size in trace message in OutboundTcpConnection 
(CASSANDRA-13028)
   * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
   * Add mutation size and batch metrics (CASSANDRA-12649)
   * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5364310b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
--
diff --cc src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index c32154e,683aed2..ceb0fa0
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@@ -335,8 -340,13 +340,9 @@@ public class OutboundTcpConnection exte
  
  private void writeInternal(MessageOut message, int id, long timestamp) 
throws IOException
  {
+ //If you add/remove fields before the message don't forget to update 
PROTOCOL_MAGIC_ID_TIMESTAMP_SIZE
  out.writeInt(MessagingService.PROTOCOL_MAGIC);
 -
 -if (targetVersion < MessagingService.VERSION_20)
 -out.writeUTF(String.valueOf(id));
 -else
 -out.writeInt(id);
 +out.writeInt(id);
  
  // int cast cuts off the high-order half of the timestamp, which we 
can assume remains
  // the same between now and when the recipient reconstructs it.

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-12 Thread jasobrown

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 9c0fa054a2cc2bfb470f6d6547ae0701dd32528f
Parents: 31501cc c0e7110
Author: Jason Brown 
Authored: Mon Dec 12 06:23:22 2016 -0800
Committer: Jason Brown 
Committed: Mon Dec 12 06:24:52 2016 -0800

--
 CHANGES.txt | 1 +
 .../org/apache/cassandra/stress/settings/SettingsCommand.java   | 5 -
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c0fa054/CHANGES.txt
--
diff --cc CHANGES.txt
index fa2bf93,c4f4c1f..6e57ea7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +4.0
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.12
+  * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
   * Add mutation size and batch metrics (CASSANDRA-12649)
   * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
   * Fix primary index calculation for SASI (CASSANDRA-12910)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-09 Thread dikang

Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  add method to get size of endpoints to TokenMetadata


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

Branch: refs/heads/trunk
Commit: d8049ae105fa37e1f8f28e8630f8a390f9a25fbb
Parents: 066ba25 4901e4b
Author: Dikang Gu 
Authored: Fri Dec 9 16:18:33 2016 -0800
Committer: Dikang Gu 
Committed: Fri Dec 9 16:19:06 2016 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/batchlog/BatchlogManager.java |  2 +-
 .../org/apache/cassandra/dht/RangeStreamer.java |  2 +-
 .../cassandra/hints/HintsDispatchExecutor.java  |  2 +-
 .../apache/cassandra/locator/TokenMetadata.java | 32 +++-
 .../cassandra/service/StorageService.java   |  6 +--
 .../cassandra/locator/TokenMetadataTest.java| 39 
 .../service/LeaveAndBootstrapTest.java  |  4 +-
 .../org/apache/cassandra/service/MoveTest.java  |  4 +-
 .../apache/cassandra/service/RemoveTest.java|  4 +-
 10 files changed, 83 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8049ae1/CHANGES.txt
--
diff --cc CHANGES.txt
index c7db5ef,3c49a8a..567e536
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +4.0
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.12
+  * add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
   * Fix primary index calculation for SASI (CASSANDRA-12910)
   * Expose time spent waiting in thread pool queue (CASSANDRA-8398)
   * Conditionally update index built status to avoid unnecessary flushes 
(CASSANDRA-12969)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8049ae1/test/unit/org/apache/cassandra/service/MoveTest.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-07 Thread aleksey

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 7a6ad9e6579e06907f9e74eba0ab2e2a26f7a963
Parents: 96ff08c 7eac22d
Author: Aleksey Yeschenko 
Authored: Wed Dec 7 20:57:06 2016 +
Committer: Aleksey Yeschenko 
Committed: Wed Dec 7 20:57:06 2016 +

--
 src/java/org/apache/cassandra/hints/HintsService.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-07 Thread aleksey

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 96ff08c1b23ec584583a415ec2cf9cca4968fa77
Parents: d2a92e4 7b1e2ed
Author: Aleksey Yeschenko 
Authored: Wed Dec 7 15:49:05 2016 +
Committer: Aleksey Yeschenko 
Committed: Wed Dec 7 15:49:05 2016 +

--
 CHANGES.txt| 2 ++
 src/java/org/apache/cassandra/index/sasi/plan/QueryController.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/96ff08c1/CHANGES.txt
--
diff --cc CHANGES.txt
index 07177a4,b581977..a827294
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +4.0
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.12
+  * Fix primary index calculation for SASI (CASSANDRA-12910)
   * Expose time spent waiting in thread pool queue (CASSANDRA-8398)
   * Conditionally update index built status to avoid unnecessary flushes 
(CASSANDRA-12969)
   * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-06 Thread dikang

Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  Expose time spent waiting in thread pool queue


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

Branch: refs/heads/trunk
Commit: 3ea0579d89d9a6297d4f94d97728892b5a953489
Parents: 4859148 6b6bc6a
Author: Dikang Gu 
Authored: Tue Dec 6 15:03:39 2016 -0800
Committer: Dikang Gu 
Committed: Tue Dec 6 15:04:24 2016 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/metrics/MessagingMetrics.java | 16 ++
 .../cassandra/net/MessageDeliveryTask.java  |  6 
 .../org/apache/cassandra/tools/NodeProbe.java   | 14 +
 .../tools/nodetool/stats/TpStatsHolder.java | 13 
 .../tools/nodetool/stats/TpStatsPrinter.java| 17 +--
 .../cassandra/net/MessagingServiceTest.java | 31 
 7 files changed, 96 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ea0579d/CHANGES.txt
--
diff --cc CHANGES.txt
index 40407bc,8b2bed7..07177a4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +4.0
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.12
+  * Expose time spent waiting in thread pool queue (CASSANDRA-8398)
   * Conditionally update index built status to avoid unnecessary flushes 
(CASSANDRA-12969)
   * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
   * cqlsh auto completion: refactor definition of compaction strategy options 
(CASSANDRA-12946)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-05 Thread samt

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: bc70e49037b17298f9273da3ae23220209c3eeca
Parents: 7e66827 afbc2e8
Author: Sam Tunnicliffe 
Authored: Mon Dec 5 11:21:04 2016 +
Committer: Sam Tunnicliffe 
Committed: Mon Dec 5 11:21:04 2016 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc70e490/CHANGES.txt
--
diff --cc CHANGES.txt
index 14e45be,3d27690..f428e31
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +4.0
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.12
+  * Conditionally update index built status to avoid unnecessary flushes 
(CASSANDRA-12969)
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc70e490/src/java/org/apache/cassandra/db/SystemKeyspace.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-04 Thread jjirsa

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: ce631bdd10e6d30cd7225b6629c7b0b92782a7af
Parents: d10d5ca 36a3ba0
Author: Jeff Jirsa 
Authored: Sun Dec 4 13:55:19 2016 -0800
Committer: Jeff Jirsa 
Committed: Sun Dec 4 13:56:51 2016 -0800

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/repair/SystemDistributedKeyspace.java   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce631bdd/CHANGES.txt
--
diff --cc CHANGES.txt
index d917570,b75a1e4..811c78d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -11,8 -2,8 +11,9 @@@
   * 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.10
   * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
   * Remove timing window in test case (CASSANDRA-12875)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-12-02 Thread dikang

Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  NoReplicationTokenAllocator should support zero replication factor


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

Branch: refs/heads/trunk
Commit: 04687c3a3644cd1315f3d2dd97dfa2da4fdcdf18
Parents: ee7f3c3 0e35799
Author: Dikang Gu 
Authored: Fri Dec 2 18:07:22 2016 -0800
Committer: Dikang Gu 
Committed: Fri Dec 2 18:08:48 2016 -0800

--
 CHANGES.txt   |  1 +
 .../dht/tokenallocator/TokenAllocatorFactory.java | 10 +-
 .../tokenallocator/NoReplicationTokenAllocatorTest.java   |  9 +
 3 files changed, 19 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/04687c3a/CHANGES.txt
--
diff --cc CHANGES.txt
index da9b27d,0f607db..3ef0e50
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +4.0
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  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)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-29 Thread jasobrown

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 6622f8730cd92f6f270938227fd0cbf50020352f
Parents: db0be34 fff319b
Author: Jason Brown 
Authored: Tue Nov 29 11:18:56 2016 -0800
Committer: Jason Brown 
Committed: Tue Nov 29 11:19:13 2016 -0800

--

--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-28 Thread jasobrown

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: b93e96a9e27eae974d674418013b679e9242d6b2
Parents: 8fb01dd f60ab23
Author: Jason Brown 
Authored: Mon Nov 28 05:35:03 2016 -0800
Committer: Jason Brown 
Committed: Mon Nov 28 05:36:06 2016 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/net/IncomingTcpConnection.java|  5 +++--
 .../org/apache/cassandra/net/MessageIn.java |  4 +---
 .../cassandra/net/MessagingServiceTest.java | 20 
 4 files changed, 13 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b93e96a9/CHANGES.txt
--
diff --cc CHANGES.txt
index 4b8eb25,15af77e..625810a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
  3.12
+  * Remove timing window in test case (CASSANDRA-12875)
   * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
   * cqlsh auto completion: refactor definition of compaction strategy options 
(CASSANDRA-12946)
   * Add support for arithmetic operators (CASSANDRA-11935)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-28 Thread jasobrown

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 8fb01dd21cdf06f457255bd48a47d6c461ce2a85
Parents: 2f8d907 554d536
Author: Jason Brown 
Authored: Mon Nov 28 05:14:55 2016 -0800
Committer: Jason Brown 
Committed: Mon Nov 28 05:17:49 2016 -0800

--
 CHANGES.txt  |   1 +
 test/conf/cassandra.keystore | Bin 1004 -> 972 bytes
 .../3.4-encrypted/CommitLog-6-1452918948163.log  | Bin 872373 -> 0 bytes
 .../3.4-encrypted/CommitLog-6-1480001790338.log  | Bin 0 -> 1452357 bytes
 .../3.4-encrypted/CommitLog-6-1480001790339.log  | Bin 0 -> 137 bytes
 .../data/legacy-commitlog/3.4-encrypted/hash.txt |   8 
 6 files changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fb01dd2/CHANGES.txt
--
diff --cc CHANGES.txt
index e5e160a,93f9fcc..4b8eb25
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
  3.12
+  * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
   * cqlsh auto completion: refactor definition of compaction strategy options 
(CASSANDRA-12946)
   * Add support for arithmetic operators (CASSANDRA-11935)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-27 Thread stefania

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 2f8d9076664c6253a3bfa173b9421cf0a37bdfe8
Parents: adadd77 68c828f
Author: Stefania Alborghetti 
Authored: Mon Nov 28 09:07:06 2016 +0800
Committer: Stefania Alborghetti 
Committed: Mon Nov 28 09:07:06 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/cql3handling.py | 47 -
 2 files changed, 32 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f8d9076/CHANGES.txt
--
diff --cc CHANGES.txt
index 4ae0882,32a3f32..e5e160a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
  3.12
+  * cqlsh auto completion: refactor definition of compaction strategy options 
(CASSANDRA-12946)
   * Add support for arithmetic operators (CASSANDRA-11935)
  
  3.11

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-16 Thread samt

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 6b9a8061f998e96f761cfacf149759a339d85b20
Parents: 394a474 78de13b
Author: Sam Tunnicliffe 
Authored: Wed Nov 16 12:29:33 2016 +
Committer: Sam Tunnicliffe 
Committed: Wed Nov 16 12:29:33 2016 +

--
 CHANGES.txt | 1 +
 .../org/apache/cassandra/streaming/ConnectionHandler.java   | 9 -
 2 files changed, 1 insertion(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b9a8061/CHANGES.txt
--
diff --cc CHANGES.txt
index 06b3a98,32f6d9b..2404809
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.10
+  * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
   * Fix Murmur3PartitionerTest (CASSANDRA-12858)
   * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
   * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-14 Thread dikang

Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  Add the range limit for the split ratio in PartitionerTestCase.


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

Branch: refs/heads/trunk
Commit: 394a474536506a8676968c7fc217f364fd07fd62
Parents: 9b02ce9 4fd05e5
Author: Dikang Gu 
Authored: Mon Nov 14 13:05:47 2016 -0800
Committer: Dikang Gu 
Committed: Mon Nov 14 13:10:56 2016 -0800

--
 CHANGES.txt  |  9 +++--
 .../dht/ByteOrderedPartitionerTest.java  |  5 +
 .../cassandra/dht/Murmur3PartitionerTest.java|  5 +
 .../dht/OrderPreservingPartitionerTest.java  |  5 +
 .../cassandra/dht/PartitionerTestCase.java   | 19 +++
 .../cassandra/dht/RandomPartitionerTest.java |  5 +
 6 files changed, 38 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/394a4745/CHANGES.txt
--
diff --cc CHANGES.txt
index 6c81d20,78d6325..06b3a98
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,14 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
- 3.11
-  * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
- Merged from 3.0:
-  * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
- 
- 
  3.10
+  * Fix Murmur3PartitionerTest (CASSANDRA-12858)
+  * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
   * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
   * Fix cassandra-stress truncate option (CASSANDRA-12695)
   * Fix crossNode value when receiving messages (CASSANDRA-12791)
@@@ -113,8 -101,9 +109,9 @@@
   * Remove pre-startup check for open JMX port (CASSANDRA-12074)
   * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
   * Restore resumable hints delivery (CASSANDRA-11960)
 - * Properly report LWT contention (CASSANDRA-12626)
 + * Properly record CAS contention (CASSANDRA-12626)
  Merged from 3.0:
+  * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
   * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
   * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
   * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-14 Thread slebresne

Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  example/triggers build fail.


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

Branch: refs/heads/trunk
Commit: 65098d0045e75b947461a5160e975a6d375f2772
Parents: 16490a4 5e9d9eb
Author: Sylvain Lebresne 
Authored: Mon Nov 14 10:13:43 2016 +0100
Committer: Sylvain Lebresne 
Committed: Mon Nov 14 10:13:43 2016 +0100

--
 .../apache/cassandra/triggers/AuditTrigger.java| 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-13 Thread stefania

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 16490a48b02b6f206a78717e9b816983f0b76bb1
Parents: 9fe436e 5788155
Author: Stefania Alborghetti 
Authored: Mon Nov 14 14:25:12 2016 +0800
Committer: Stefania Alborghetti 
Committed: Mon Nov 14 14:25:12 2016 +0800

--
 CHANGES.txt |   1 +
 bin/cqlsh.py| 234 +-
 pylib/cqlshlib/cqlshhandling.py | 310 +++
 3 files changed, 315 insertions(+), 230 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/16490a48/CHANGES.txt
--
diff --cc CHANGES.txt
index ea757f6,a8ef42c..6c81d20
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.11
+  * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
  Merged from 3.0:
   * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-07 Thread jake

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 459946aeef05e2a5a0db7b61b48861eb54958b08
Parents: c47d395 d582d03
Author: T Jake Luciani 
Authored: Mon Nov 7 14:10:15 2016 -0500
Committer: T Jake Luciani 
Committed: Mon Nov 7 14:10:15 2016 -0500

--
 CHANGES.txt| 1 +
 tools/stress/src/org/apache/cassandra/stress/StressAction.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/459946ae/CHANGES.txt
--
diff --cc CHANGES.txt
index bbe79e6,bdb6e29..21f179f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.10
+  * Fix cassandra-stress truncate option (CASSANDRA-12695)
   * Fix crossNode value when receiving messages (CASSANDRA-12791)
   * Don't load MX4J beans twice (CASSANDRA-12869)
   * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-03 Thread stefania

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 22a3db0653ea5a45b396c7d8c07138d4257be5d6
Parents: 8fcedf5 9d9a1a1
Author: Stefania Alborghetti 
Authored: Thu Nov 3 16:09:43 2016 +0800
Committer: Stefania Alborghetti 
Committed: Thu Nov 3 16:09:43 2016 +0800

--
 CHANGES.txt |  1 +
 .../cassandra/db/ReadCommandVerbHandler.java|  4 +-
 .../db/monitoring/ConstructionTime.java | 41 ---
 .../cassandra/db/monitoring/Monitorable.java|  3 +-
 .../db/monitoring/MonitorableImpl.java  | 22 --
 .../cassandra/db/monitoring/MonitoringTask.java | 10 +--
 .../cassandra/net/IncomingTcpConnection.java|  2 +-
 .../cassandra/net/MessageDeliveryTask.java  |  4 +-
 .../org/apache/cassandra/net/MessageIn.java | 71 +---
 .../apache/cassandra/net/MessagingService.java  | 44 ++--
 .../apache/cassandra/service/ReadCallback.java  |  3 +-
 .../apache/cassandra/service/StorageProxy.java  |  3 +-
 .../db/monitoring/MonitoringTaskTest.java   | 56 ---
 .../org/apache/cassandra/hints/HintTest.java|  4 +-
 .../cassandra/hints/HintsServiceTest.java   |  3 +-
 .../apache/cassandra/net/MatcherResponse.java   |  2 +-
 .../cassandra/net/MessagingServiceTest.java | 16 ++---
 .../cassandra/net/MockMessagingServiceTest.java |  6 +-
 .../cassandra/service/DataResolverTest.java |  3 +-
 19 files changed, 147 insertions(+), 151 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/22a3db06/CHANGES.txt
--
diff --cc CHANGES.txt
index 176d34a,40aace3..fb16d4b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.10
+  * Fix crossNode value when receiving messages (CASSANDRA-12791)
   * Don't load MX4J beans twice (CASSANDRA-12869)
   * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
   * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-11-02 Thread snazy

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 8fcedf544a7732341dc675804237814184910b14
Parents: 8abb632 d2d7299
Author: Robert Stupp 
Authored: Wed Nov 2 19:22:23 2016 +0100
Committer: Robert Stupp 
Committed: Wed Nov 2 19:22:23 2016 +0100

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fcedf54/CHANGES.txt
--
diff --cc CHANGES.txt
index a1462a6,25facd5..176d34a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.10
+  * Don't load MX4J beans twice (CASSANDRA-12869)
   * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
   * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
   * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-31 Thread mshuler

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: e84a8f3918c53b9f469b73ebff35de9092212341
Parents: b4068ef a3828ca
Author: Michael Shuler 
Authored: Mon Oct 31 08:58:07 2016 -0500
Committer: Michael Shuler 
Committed: Mon Oct 31 08:58:07 2016 -0500

--

--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-27 Thread samt

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 0919ae2c205fefd7ab1a6e81149104cfc8cc7f08
Parents: 93a06b9 49ce0a4
Author: Sam Tunnicliffe 
Authored: Thu Oct 27 14:54:04 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Thu Oct 27 14:54:04 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0919ae2c/CHANGES.txt
--
diff --cc CHANGES.txt
index 5991e84,436b77b..f2e2a8d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.10
+  * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
   * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
   * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
   * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-27 Thread snazy

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 93a06b9ea92f211abbf0ea7ed4113de2434f8b8a
Parents: 516bdfc 8f0d5a2
Author: Robert Stupp 
Authored: Thu Oct 27 11:43:07 2016 +0200
Committer: Robert Stupp 
Committed: Thu Oct 27 11:43:07 2016 +0200

--
 CHANGES.txt |   1 +
 build.xml   |   2 -
 lib/licenses/primitive-1.0.txt  | 201 -
 lib/licenses/snowball-stemmer-1.3.0.581.1.txt   | 204 +
 lib/primitive-1.0.jar   | Bin 52589 -> 0 bytes
 .../cassandra/index/sasi/sa/SuffixSA.java   |   4 +-
 .../org/apache/cassandra/utils/LongTimSort.java | 868 +++
 7 files changed, 880 insertions(+), 400 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/93a06b9e/CHANGES.txt
--
diff --cc CHANGES.txt
index d415f87,89c94dd..5991e84
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.10
+  * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
   * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
   * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
   * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/93a06b9e/build.xml
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-26 Thread samt

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 516bdfcd28347636fbe3abc0d151c37445db9606
Parents: 41681e0 bdd4a92
Author: Sam Tunnicliffe 
Authored: Wed Oct 26 17:35:08 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Wed Oct 26 17:35:08 2016 +0100

--
 CHANGES.txt |  1 +
 .../apache/cassandra/utils/JMXServerUtils.java  | 25 
 2 files changed, 22 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/516bdfcd/CHANGES.txt
--
diff --cc CHANGES.txt
index fcd57c7,847bae6..d415f87
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.10
+  * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
   * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
   * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
   * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-25 Thread aleksey

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 6d40809d809709aefb296230c3ab7c91164640b6
Parents: 2505733 e2a0d75
Author: Aleksey Yeschenko 
Authored: Tue Oct 25 16:57:19 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Oct 25 16:58:41 2016 +0100

--
 CHANGES.txt |   4 +-
 .../cassandra/dht/ByteOrderedPartitioner.java   |   5 +
 .../org/apache/cassandra/dht/IPartitioner.java  |   5 +
 .../apache/cassandra/dht/LocalPartitioner.java  |   5 +
 .../cassandra/dht/Murmur3Partitioner.java   |  36 +++
 .../dht/OrderPreservingPartitioner.java |   5 +
 .../apache/cassandra/dht/RandomPartitioner.java |  37 ++-
 .../NoReplicationTokenAllocator.java| 266 ++
 .../ReplicationAwareTokenAllocator.java | 250 +
 .../dht/tokenallocator/TokenAllocation.java |   2 +-
 .../dht/tokenallocator/TokenAllocator.java  |   2 +-
 .../dht/tokenallocator/TokenAllocatorBase.java  | 279 +++
 .../tokenallocator/TokenAllocatorFactory.java   |  37 +++
 ...tractReplicationAwareTokenAllocatorTest.java | 175 +---
 .../NoReplicationTokenAllocatorTest.java| 249 +
 .../tokenallocator/TokenAllocatorTestBase.java  | 160 +++
 .../apache/cassandra/dht/LengthPartitioner.java |   5 +
 .../cassandra/dht/Murmur3PartitionerTest.java   |  23 ++
 .../cassandra/dht/PartitionerTestCase.java  |  32 +++
 .../cassandra/dht/RandomPartitionerTest.java|  26 ++
 20 files changed, 1178 insertions(+), 425 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d40809d/CHANGES.txt
--
diff --cc CHANGES.txt
index 0c966b8,0f16a0e..fcd57c7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,13 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
- Merged from 3.0:
-  * Include SSTable filename in compacting large row message (CASSANDRA-12384)
++
 +
  3.10
+  * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
   * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
   * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
   * Use different build directories for Eclipse and Ant (CASSANDRA-12466)

[3/3] cassandra git commit: Merge branch cassandra-3.X into trunk

2016-10-25 Thread blerer

Merge branch cassandra-3.X into trunk


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

Branch: refs/heads/trunk
Commit: 4c728d2e48936ba9721926607f79a462925364c9
Parents: 9d4fd90 8644aa9
Author: Benjamin Lerer 
Authored: Tue Oct 25 12:13:41 2016 +0200
Committer: Benjamin Lerer 
Committed: Tue Oct 25 12:13:53 2016 +0200

--
 CHANGES.txt| 2 ++
 build.xml  | 2 +-
 pylib/cqlshlib/cql3handling.py | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c728d2e/CHANGES.txt
--
diff --cc CHANGES.txt
index 7b2666d,e6477d7..f9e3e34
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,6 +1,15 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +Merged from 3.0:
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 +
  3.10
+  * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
+  * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
   * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
   * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
   * Upgrade commons-codec to 1.9 (CASSANDRA-12790)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c728d2e/build.xml
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-24 Thread stefania

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 9d4fd903fb1888cbbaca85d43458fda0b10dac22
Parents: b921ddf 13b7362
Author: Stefania Alborghetti 
Authored: Tue Oct 25 10:03:37 2016 +0800
Committer: Stefania Alborghetti 
Committed: Tue Oct 25 10:03:37 2016 +0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d4fd903/CHANGES.txt
--
diff --cc CHANGES.txt
index 8504e0b,ef728c7..7b2666d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,9 +1,18 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +Merged from 3.0:
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 +
  3.10
+  * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
   * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
   * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 - * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
   * Add duration data type (CASSANDRA-11873)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
   * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
   * Improve sum aggregate functions (CASSANDRA-12417)
   * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-23 Thread stefania

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 3c7206078d7c527b8ae759d489b48a0cc598c067
Parents: aedb218 7c759e2
Author: Stefania Alborghetti 
Authored: Mon Oct 24 11:11:25 2016 +0800
Committer: Stefania Alborghetti 
Committed: Mon Oct 24 11:11:25 2016 +0800

--
 tools/cqlstress-counter-example.yaml|  3 +-
 tools/cqlstress-example.yaml|  2 +-
 tools/cqlstress-insanity-example.yaml   |  2 +-
 .../stress/generate/DistributionSequence.java   |  5 +++-
 .../stress/settings/OptionDistribution.java |  2 +-
 .../generate/DistributionSequenceTest.java  | 31 
 6 files changed, 39 insertions(+), 6 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-20 Thread zznate

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 42da0eaf247c48b083a464cdf4dac676d0fac84a
Parents: 4d34032 ddb3e6a
Author: Nate McCall 
Authored: Fri Oct 21 15:25:28 2016 +1300
Committer: Nate McCall 
Committed: Fri Oct 21 15:26:41 2016 +1300

--
 CHANGES.txt   | 3 +++
 .../apache/cassandra/io/sstable/format/big/BigTableWriter.java| 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/42da0eaf/CHANGES.txt
--
diff --cc CHANGES.txt
index e63b23b,13653b7..1e9bc7d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,3 +1,12 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
++Merged from 3.0:
++ * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 +
  3.10
   * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
   * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
@@@ -93,8 -86,9 +95,9 @@@
   * Remove pre-startup check for open JMX port (CASSANDRA-12074)
   * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
   * Restore resumable hints delivery (CASSANDRA-11960)
 - * Properly report LWT contention (CASSANDRA-12626)
 + * Properly record CAS contention (CASSANDRA-12626)
  Merged from 3.0:
+  * Include SSTable filename in compacting large row message (CASSANDRA-12384)
   * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
   * Fix ViewTest.testCompaction (CASSANDRA-12789)
   * Improve avg aggregate functions (CASSANDRA-12417)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-20 Thread stefania

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 4d3403293477b6f9389a47da94cbbe975ce138d4
Parents: 4f8a1c8 e6d22da
Author: Stefania Alborghetti 
Authored: Fri Oct 21 09:24:35 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Oct 21 09:24:35 2016 +0800

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/dht/RandomPartitioner.java | 2 +-
 src/java/org/apache/cassandra/utils/GuidGenerator.java   | 9 -
 3 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d340329/CHANGES.txt
--
diff --cc CHANGES.txt
index 94a1a4e,8a0e169..e63b23b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,8 +1,15 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
  3.10
+  * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
   * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 - * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
   * Add duration data type (CASSANDRA-11873)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
   * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
   * Improve sum aggregate functions (CASSANDRA-12417)
   * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-19 Thread carl

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 7b756cca888fb798d20043043c6d18c3258ea8d7
Parents: 5b6dee9 5f2367e
Author: Carl Yeksigian 
Authored: Wed Oct 19 11:08:55 2016 -0400
Committer: Carl Yeksigian 
Committed: Wed Oct 19 11:08:55 2016 -0400

--
 .../org/apache/cassandra/db/ColumnFamilyStoreCQLHelperTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-18 Thread jjirsa

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 4d7918df35746f6c832b6fb957a8403077757fe9
Parents: ea909c8 3bf043e
Author: Jeff Jirsa 
Authored: Tue Oct 18 17:28:43 2016 -0700
Committer: Jeff Jirsa 
Committed: Tue Oct 18 17:31:16 2016 -0700

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/service/StorageProxy.java | 11 +--
 2 files changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d7918df/CHANGES.txt
--
diff --cc CHANGES.txt
index 8f8b7e1,dc98ca7..4c300fe
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -91,6 -84,7 +91,7 @@@
   * Remove pre-startup check for open JMX port (CASSANDRA-12074)
   * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
   * Restore resumable hints delivery (CASSANDRA-11960)
 - * Properly report LWT contention (CASSANDRA-12626)
++ * Properly record CAS contention (CASSANDRA-12626)
  Merged from 3.0:
   * Improve avg aggregate functions (CASSANDRA-12417)
   * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-17 Thread stefania

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: a4705c28b70a3959ef1dd241501f9c0fe2d8f906
Parents: f2a3547 c6ec31b
Author: Stefania Alborghetti 
Authored: Tue Oct 18 09:10:05 2016 +0800
Committer: Stefania Alborghetti 
Committed: Tue Oct 18 09:10:05 2016 +0800

--
 CHANGES.txt |   1 +
 .../apache/cassandra/dht/RandomPartitioner.java |   2 +-
 .../apache/cassandra/utils/GuidGenerator.java   |   5 +-
 ...tractReplicationAwareTokenAllocatorTest.java | 716 ++
 ...rmur3ReplicationAwareTokenAllocatorTest.java |  48 ++
 ...andomReplicationAwareTokenAllocatorTest.java |  54 ++
 .../ReplicationAwareTokenAllocatorTest.java | 755 ---
 test/unit/org/apache/cassandra/Util.java|  20 +-
 8 files changed, 835 insertions(+), 766 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4705c28/CHANGES.txt
--
diff --cc CHANGES.txt
index c7b3206,32a2dfd..8f112ed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
  3.10
+  * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
   * Improve sum aggregate functions (CASSANDRA-12417)
   * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
   * cqlsh fails to format collections when using aliases (CASSANDRA-11534)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-17 Thread mshuler

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: d478f45d1061c9ee6605193cf4a5dfda4348e0aa
Parents: b51f7e2 7a5118c
Author: Michael Shuler 
Authored: Mon Oct 17 16:20:15 2016 -0500
Committer: Michael Shuler 
Committed: Mon Oct 17 16:20:15 2016 -0500

--
 doc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d478f45d/doc/Makefile
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-17 Thread mshuler

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: e66305de0912a0f5f42ba70b72312d38b7d11d98
Parents: 4cd7747 720acc6
Author: Michael Shuler 
Authored: Mon Oct 17 13:38:46 2016 -0500
Committer: Michael Shuler 
Committed: Mon Oct 17 13:38:46 2016 -0500

--
 doc/source/getting_started/installing.rst | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-14 Thread aleksey

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: b3a0130d1d76af903c1e5bcc2b65a2ef120e3626
Parents: 17bd6ad e722046
Author: Aleksey Yeschenko 
Authored: Fri Oct 14 17:15:22 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Fri Oct 14 17:15:22 2016 +0100

--
 CHANGES.txt | 1 +
 conf/cassandra.yaml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3a0130d/CHANGES.txt
--
diff --cc CHANGES.txt
index 0aef01c,5023590..63ed4a6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 +
 +
  3.10
+  * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
   * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
   * Check for hash conflicts in prepared statements (CASSANDRA-12733)
   * Exit query parsing upon first error (CASSANDRA-12598)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-12 Thread stefania

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 2ab4666cd396aa58d313f16f821d5b81025a6a7d
Parents: 9f75e70 a041908
Author: Stefania Alborghetti 
Authored: Thu Oct 13 09:26:53 2016 +0800
Committer: Stefania Alborghetti 
Committed: Thu Oct 13 09:26:53 2016 +0800

--
 CHANGES.txt |   1 +
 bin/cqlsh.py|  30 +--
 ...driver-internal-only-3.7.0.post0-70f41b5.zip | Bin 0 -> 252036 bytes
 pylib/cqlshlib/test/test_cqlsh_output.py|  15 ++
 4 files changed, 30 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ab4666c/CHANGES.txt
--
diff --cc CHANGES.txt
index f001d57,f0df0e6..022166a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 +
 +
  3.10
+  * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
   * Check for hash conflicts in prepared statements (CASSANDRA-12733)
   * Exit query parsing upon first error (CASSANDRA-12598)
   * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-11 Thread aleksey

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 231a9370619c86a0661ee421572750ea0ab197bf
Parents: dffe270 c7fb95c
Author: Aleksey Yeschenko 
Authored: Tue Oct 11 14:33:55 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Oct 11 14:33:55 2016 +0100

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/cql3/QueryProcessor.java   | 16 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/231a9370/CHANGES.txt
--
diff --cc CHANGES.txt
index 1310795,5907c74..7f5b7cb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +4.0
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 +
 +
  3.10
+  * Check for hash conflicts in prepared statements (CASSANDRA-12733)
   * Exit query parsing upon first error (CASSANDRA-12598)
   * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
   * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-10 Thread jake

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: be2b8cdee4208b68ba074b646da79385ece8a929
Parents: 25a3759 cbc7925
Author: T Jake Luciani 
Authored: Mon Oct 10 09:55:12 2016 -0400
Committer: T Jake Luciani 
Committed: Mon Oct 10 09:55:12 2016 -0400

--
 .../src/org/apache/cassandra/stress/settings/SettingsPort.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-10 Thread jake

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 25a3759f1ae40592fb69d79a7e38f3d3d173868a
Parents: 03e2e0a 1bc736d
Author: T Jake Luciani 
Authored: Mon Oct 10 09:51:55 2016 -0400
Committer: T Jake Luciani 
Committed: Mon Oct 10 09:51:55 2016 -0400

--
 CHANGES.txt   | 1 +
 .../src/org/apache/cassandra/stress/generate/values/UUIDs.java| 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25a3759f/CHANGES.txt
--
diff --cc CHANGES.txt
index 373ad02,f4dda82..74509fa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +4.0
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 +
 +
  3.10
+  * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
   * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
   * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
   * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-06 Thread stefania

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 324bd7187325e78c073555fafac1499e5b241880
Parents: c3f7c2c 47c473a
Author: Stefania Alborghetti 
Authored: Fri Oct 7 12:14:10 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Oct 7 12:14:10 2016 +0800

--
 CHANGES.txt |  1 +
 .../apache/cassandra/cql3/QueryProcessor.java   | 18 -
 .../cassandra/io/sstable/CQLSSTableWriter.java  | 36 +++---
 .../io/sstable/CQLSSTableWriterTest.java| 71 ++--
 .../apache/cassandra/stress/StressProfile.java  |  5 +-
 5 files changed, 93 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/324bd718/CHANGES.txt
--
diff --cc CHANGES.txt
index 837b976,f566b1b..b5d5bf4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +4.0
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 +
 +
  3.10
+  * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
   * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
   * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
   * Add hint delivery metrics (CASSANDRA-12693)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-05 Thread snazy

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 670b99b9d36542bc33db2eb782fa49175faf0d27
Parents: c6338cd b3a4e20
Author: Robert Stupp 
Authored: Wed Oct 5 09:39:23 2016 +0200
Committer: Robert Stupp 
Committed: Wed Oct 5 09:39:23 2016 +0200

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/config/Config.java | 116 ++---
 .../cassandra/config/DatabaseDescriptor.java| 164 ++-
 .../org/apache/cassandra/db/SystemKeyspace.java |   2 +-
 .../db/commitlog/CommitLogReplayer.java |   5 +-
 .../compaction/LeveledCompactionStrategy.java   |  14 +-
 .../cassandra/net/IncomingTcpConnection.java|   2 +-
 .../cassandra/net/OutboundTcpConnection.java|   2 +-
 .../repair/SystemDistributedKeyspace.java   |   3 +-
 .../apache/cassandra/schema/SchemaKeyspace.java |   2 +-
 10 files changed, 160 insertions(+), 151 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/670b99b9/CHANGES.txt
--
diff --cc CHANGES.txt
index 4f7ebfb,08de041..837b976
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +4.0
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 +
 +
  3.10
+  * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
   * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
   * Add hint delivery metrics (CASSANDRA-12693)
   * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-04 Thread stefania

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 13a46f073f3b9ba7ab4f8cfd010601619444f33a
Parents: 700a1dc 9fd0d07
Author: Stefania Alborghetti 
Authored: Wed Oct 5 09:37:14 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Oct 5 09:37:14 2016 +0800

--
 CHANGES.txt |  1 +
 .../cassandra/service/StorageService.java   | 59 
 2 files changed, 60 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/13a46f07/CHANGES.txt
--
diff --cc CHANGES.txt
index 8d83c02,d86a36c..4d8184f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +4.0
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 +
 +
  3.10
+  * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
   * Add hint delivery metrics (CASSANDRA-12693)
   * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
   * ColumnIndex does not reuse buffer (CASSANDRA-12502)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-04 Thread aleksey

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: c819cb8563092b67fc82322d0540e362ab993ac5
Parents: 353bfdd 0ac1079
Author: Aleksey Yeschenko 
Authored: Tue Oct 4 14:31:24 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Oct 4 14:31:39 2016 +0100

--
 CHANGES.txt |  2 ++
 .../apache/cassandra/hints/HintsDispatcher.java | 29 ++--
 .../cassandra/metrics/HintsServiceMetrics.java  |  9 ++
 3 files changed, 37 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c819cb85/CHANGES.txt
--
diff --cc CHANGES.txt
index 724bdb1,20bb4ff..de2c351
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,9 @@@
 +4.0
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 +
++
  3.10
+  * Add hint delivery metrics (CASSANDRA-12693)
   * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
   * ColumnIndex does not reuse buffer (CASSANDRA-12502)
   * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-04 Thread snazy

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 353bfddece99de31f2f0d341b2a832ddae542696
Parents: fb22761 033f256
Author: Robert Stupp 
Authored: Tue Oct 4 14:40:59 2016 +0200
Committer: Robert Stupp 
Committed: Tue Oct 4 14:40:59 2016 +0200

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/RowIndexEntry.java  | 35 
 .../io/sstable/LargePartitionsTest.java | 22 ++--
 3 files changed, 27 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/353bfdde/CHANGES.txt
--
diff --cc CHANGES.txt
index af78f3e,64743b4..724bdb1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 +4.0
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 +
  3.10
+  * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
   * ColumnIndex does not reuse buffer (CASSANDRA-12502)
   * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
   * Upgrade metrics-reporter dependencies (CASSANDRA-12089)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-04 Thread snazy

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: fb227618d9710c377ec41dbdf3de7b2b829c5af8
Parents: 4ddd7b9 433dd1c
Author: Robert Stupp 
Authored: Tue Oct 4 13:39:53 2016 +0200
Committer: Robert Stupp 
Committed: Tue Oct 4 13:39:53 2016 +0200

--
 CHANGES.txt|  2 +-
 .../cassandra/db/compaction/CompactionManager.java | 17 +++--
 .../cassandra/db/compaction/CompactionTask.java|  3 +--
 3 files changed, 17 insertions(+), 5 deletions(-)
--


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

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-04 Thread snazy

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 4ddd7b9038d8b0c2f2357ba322d2678c0a3e3e08
Parents: 723d055 c2106e1
Author: Robert Stupp 
Authored: Tue Oct 4 13:31:27 2016 +0200
Committer: Robert Stupp 
Committed: Tue Oct 4 13:31:27 2016 +0200

--
 CHANGES.txt   |  1 +
 src/java/org/apache/cassandra/db/ColumnIndex.java | 12 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ddd7b90/CHANGES.txt
--
diff --cc CHANGES.txt
index d0d706b,af81195..0c08077
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 +4.0
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 +
  3.10
+  * ColumnIndex does not reuse buffer (CASSANDRA-12502)
   * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
   * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
   * Tune compaction thread count via nodetool (CASSANDRA-12248)

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-09-30 Thread yukim

Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 8d4478ba282c52b64ff1b925884582f394490cc6
Parents: 56e0177 cf5cd15
Author: Yuki Morishita 
Authored: Fri Sep 30 09:58:03 2016 -0500
Committer: Yuki Morishita 
Committed: Fri Sep 30 09:58:03 2016 -0500

--
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 --
 src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java   | 4 +++-
 .../org/apache/cassandra/test/microbench/MutationBench.java  | 3 +++
 .../org/apache/cassandra/config/DatabaseDescriptorRefTest.java   | 1 +
 .../org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java  | 3 +++
 5 files changed, 10 insertions(+), 3 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-09-29 Thread slebresne

Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  cdc column addition still breaks schema migration tasks


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

Branch: refs/heads/trunk
Commit: c18968b1bd54b182f8d65126ccc03586001b62ed
Parents: 78ff377 57e9a83
Author: Sylvain Lebresne 
Authored: Thu Sep 29 17:00:57 2016 +0200
Committer: Sylvain Lebresne 
Committed: Thu Sep 29 17:00:57 2016 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/db/rows/WithOnlyQueriedData.java  |  7 +
 .../cassandra/db/transform/Transformation.java  | 12 +
 .../cassandra/db/transform/UnfilteredRows.java  | 11 
 .../apache/cassandra/schema/SchemaKeyspace.java | 28 +++-
 5 files changed, 58 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c18968b1/CHANGES.txt
--
diff --cc CHANGES.txt
index 03456a0,c33b1d3..8a1fd1d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 +4.0
 +
 +
  3.10
+  * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
   * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
   * Tune compaction thread count via nodetool (CASSANDRA-12248)
   * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)

57 matches

Mail list logo