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

2017-01-15 Thread paulo 
Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: 243be7812b6699a399b62d9397c57c1f0c9db619
Parents: 3bcdbd6 db2c50d
Author: Paulo Motta 
Authored: Sun Jan 15 22:35:55 2017 -0200
Committer: Paulo Motta 
Committed: Sun Jan 15 22:35:55 2017 -0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/243be781/CHANGES.txt
--
diff --cc CHANGES.txt
index 917eb5d,c7e4114..f1343b8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 +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)
 + * Allow IN restrictions on column families with collections (CASSANDRA-12654)
 + * 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)
 + * 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)
 + * 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)
 + * Add support for arithmetic operators (CASSANDRA-11935)
 + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 +
 +
  3.10
+  * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
   * Fixed query monitoring for range queries (CASSANDRA-13050)
   * Remove outboundBindAny configuration property (CASSANDRA-12673)
   * Use correct bounds for all-data range when filtering (CASSANDRA-12666)

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

2017-01-06 Thread snazy 
Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: dfd8dcf721c5a7e62afccb3e5a4fc2ededd1f2e0
Parents: c5c7f82 858cb25
Author: Robert Stupp 
Authored: Sat Jan 7 01:17:42 2017 +0100
Committer: Robert Stupp 
Committed: Sat Jan 7 01:17:42 2017 +0100

--

--

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

2017-01-06 Thread snazy 
Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: c5c7f82dbd8cce8e3c04f30b05e1830884a7deed
Parents: 2e675b5 0e9e0a4
Author: Robert Stupp 
Authored: Fri Jan 6 15:54:08 2017 +0100
Committer: Robert Stupp 
Committed: Fri Jan 6 15:54:08 2017 +0100

--

--

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

2016-12-22 Thread stefania 
Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: cc16ff11cab4d20420e865079e0b2536652e00de
Parents: 0d4fdad 84b1725
Author: Stefania Alborghetti 
Authored: Fri Dec 23 09:41:38 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Dec 23 09:41:38 2016 +0800

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/ReadCommand.java| 40 
 .../db/SinglePartitionReadCommand.java  |  4 +-
 .../apache/cassandra/db/filter/RowFilter.java   | 11 +-
 .../db/RepairedDataTombstonesTest.java  |  8 ++--
 5 files changed, 42 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc16ff11/CHANGES.txt
--
diff --cc CHANGES.txt
index 69293bb,0c215a2..4cb3c45
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 +3.12
 + * Allow IN restrictions on column families with collections (CASSANDRA-12654)
 + * 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)
 + * 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)
 + * 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)
 + * Add support for arithmetic operators (CASSANDRA-11935)
 + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 +
 +
  3.10
+  * Fixed query monitoring for range queries (CASSANDRA-13050)
   * Remove outboundBindAny configuration property (CASSANDRA-12673)
   * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
   * Remove timing window in test case (CASSANDRA-12875)

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

2016-12-14 Thread jmckenzie 
Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: de84f264fec3dae23f60ac829b55db792f39aa37
Parents: 83ba3b7 249e4b1
Author: Joshua McKenzie 
Authored: Wed Dec 14 15:21:50 2016 -0500
Committer: Joshua McKenzie 
Committed: Wed Dec 14 15:21:50 2016 -0500

--

--

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

2016-11-30 Thread blambov 
Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: 2ff97fec30023b8eb45d9ade82fc6a659486f1c6
Parents: 0475922 f00e431
Author: Branimir Lambov 
Authored: Wed Nov 30 14:46:39 2016 +0200
Committer: Branimir Lambov 
Committed: Wed Nov 30 14:47:22 2016 +0200

--
 CHANGES.txt   |  1 +
 .../cql3/restrictions/StatementRestrictions.java  | 10 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ff97fec/CHANGES.txt
--
diff --cc CHANGES.txt
index 47b7c2a,b238018..64ed71c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.12
 + * cqlsh auto completion: refactor definition of compaction strategy options 
(CASSANDRA-12946)
 + * Add support for arithmetic operators (CASSANDRA-11935)
 +
 +
  3.10
+  * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
   * Remove timing window in test case (CASSANDRA-12875)
   * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
   * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)

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

2016-11-23 Thread stefania 
Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: 25653baab7a543ad78b2f6a5495f2f39859aeaf3
Parents: 6854191 12c63cf
Author: Stefania Alborghetti 
Authored: Thu Nov 24 08:58:15 2016 +0800
Committer: Stefania Alborghetti 
Committed: Thu Nov 24 08:58:15 2016 +0800

--
 CHANGES.txt |  1 +
 .../cassandra/stress/util/JavaDriverClient.java | 33 +++-
 2 files changed, 20 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25653baa/CHANGES.txt
--
diff --cc CHANGES.txt
index b1fd83f,9be3e7c..3f47bab
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 +3.12
 + * Add support for arithmetic operators (CASSANDRA-11935)
 +
  3.11
+  * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
   * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
   * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)

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

2016-11-22 Thread samt 
Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: d15274522cd027a47eb7b9bd96592433253c98aa
Parents: 8b3de2f 9cc0c80
Author: Sam Tunnicliffe 
Authored: Tue Nov 22 16:58:18 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 22 16:58:18 2016 +

--
 CHANGES.txt |   1 +
 .../cassandra/config/ColumnDefinition.java  |  24 -
 .../apache/cassandra/db/marshal/UserType.java   |  15 +++
 .../apache/cassandra/db/rows/AbstractCell.java  |  18 +---
 .../apache/cassandra/db/rows/AbstractRow.java   |  34 +--
 .../cassandra/thrift/ThriftValidation.java  |   3 +-
 test/unit/org/apache/cassandra/db/CellTest.java | 100 ++-
 7 files changed, 165 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1527452/CHANGES.txt
--
diff --cc CHANGES.txt
index 1f1625c,92bf1ce..b1fd83f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 +3.12
 + * Add support for arithmetic operators (CASSANDRA-11935)
 +
  3.11
+  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
   * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
  
  3.10

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1527452/src/java/org/apache/cassandra/db/marshal/UserType.java
--