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

[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/d6c7a2db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6c7a2db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6c7a2db

Branch: refs/heads/trunk
Commit: d6c7a2db769b819b8c539daf909fffe362fadaa1
Parents: 05106f0 243be78
Author: Paulo Motta 
Authored: Sun Jan 15 22:37:02 2017 -0200
Committer: Paulo Motta 
Committed: Sun Jan 15 22:37:02 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/d6c7a2db/CHANGES.txt
--
diff --cc CHANGES.txt
index 3ed8e15,f1343b8..c29da96
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -29,7 -18,9 +29,8 @@@
   * 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)

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

[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/18f28c51
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18f28c51
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18f28c51

Branch: refs/heads/trunk
Commit: 18f28c517324d5055bf0a3e16187055d62c11828
Parents: 5ce08a7 dfd8dcf
Author: Robert Stupp 
Authored: Sat Jan 7 01:17:46 2017 +0100
Committer: Robert Stupp 
Committed: Sat Jan 7 01:17:46 2017 +0100

--

--

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

[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/5ce08a72
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ce08a72
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ce08a72

Branch: refs/heads/trunk
Commit: 5ce08a728545e57d299b004c67df3fa4cd3fd8ba
Parents: a1f0dcd c5c7f82
Author: Robert Stupp 
Authored: Fri Jan 6 15:54:15 2017 +0100
Committer: Robert Stupp 
Committed: Fri Jan 6 15:54:15 2017 +0100

--

--

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

[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/554d6beb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/554d6beb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/554d6beb

Branch: refs/heads/trunk
Commit: 554d6beb0920cba9bcc0124fa9f33c580012b761
Parents: da41476 cc16ff1
Author: Stefania Alborghetti 
Authored: Fri Dec 23 09:42:01 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Dec 23 09:42:01 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/554d6beb/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/554d6beb/src/java/org/apache/cassandra/db/ReadCommand.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/554d6beb/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/554d6beb/src/java/org/apache/cassandra/db/filter/RowFilter.java
--

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

[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/b88ddb8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b88ddb8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b88ddb8a

Branch: refs/heads/trunk
Commit: b88ddb8ab0d130db67ffcecca6d0b4eac3d06e6f
Parents: dad5b96 de84f26
Author: Joshua McKenzie 
Authored: Wed Dec 14 15:22:04 2016 -0500
Committer: Joshua McKenzie 
Committed: Wed Dec 14 15:22:04 2016 -0500

--

--

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

[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/066ba25c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/066ba25c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/066ba25c

Branch: refs/heads/trunk
Commit: 066ba25c53ff5753521e5c9a78c434916d57607f
Parents: 343612a 599dbbc
Author: Paulo Motta 
Authored: Fri Dec 9 16:20:47 2016 -0200
Committer: Paulo Motta 
Committed: Fri Dec 9 16:20:47 2016 -0200

--
 CHANGES.txt |  1 +
 NEWS.txt|  1 +
 src/java/org/apache/cassandra/config/Config.java| 12 
 .../cassandra/hadoop/cql3/CqlBulkRecordWriter.java  |  1 -
 .../apache/cassandra/net/OutboundTcpConnectionPool.java |  7 +--
 5 files changed, 3 insertions(+), 19 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/066ba25c/NEWS.txt
--

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

[slebresne]

Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  Make distinction between unset row and non-existing partition for LWTs


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

Branch: refs/heads/trunk
Commit: 894b4e20ed9cbf997d9511b48f09d4cab52fd421
Parents: 717e132 26339b3
Author: Sylvain Lebresne 
Authored: Thu Dec 8 17:28:10 2016 +0100
Committer: Sylvain Lebresne 
Committed: Thu Dec 8 17:28:10 2016 +0100

--
 .../cql3/statements/CQL3CasRequest.java | 10 +++---
 .../cassandra/db/filter/ColumnFilter.java   |  9 ++
 .../operations/InsertUpdateIfConditionTest.java | 32 +++-
 3 files changed, 46 insertions(+), 5 deletions(-)
--

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

[slebresne]

Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  CQL often queries static columns unnecessarily


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

Branch: refs/heads/trunk
Commit: 8253912a607e6ead437bd7f19f76fd723077f754
Parents: c582336 57c2003
Author: Sylvain Lebresne 
Authored: Wed Dec 7 11:19:08 2016 +0100
Committer: Sylvain Lebresne 
Committed: Wed Dec 7 11:19:08 2016 +0100

--
 .../cql3/statements/SelectStatement.java| 26 --
 .../cassandra/db/filter/ColumnFilter.java   | 92 +---
 .../org/apache/cassandra/db/rows/BTreeRow.java  |  2 +-
 .../apache/cassandra/schema/SchemaKeyspace.java |  2 +-
 .../apache/cassandra/db/ReadCommandTest.java|  2 +-
 5 files changed, 84 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8253912a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--

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

[blambov]

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/cba3c014
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cba3c014
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cba3c014

Branch: refs/heads/trunk
Commit: cba3c0141acbe5f327622c87253c0e8316918867
Parents: bcb6762 2ff97fe
Author: Branimir Lambov 
Authored: Wed Nov 30 14:48:24 2016 +0200
Committer: Branimir Lambov 
Committed: Wed Nov 30 14:49:11 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/cba3c014/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba3c014/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
--

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

[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/5af71cf6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5af71cf6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5af71cf6

Branch: refs/heads/trunk
Commit: 5af71cf691134836965a6ac81633b7651b73e3c3
Parents: df84bdf 25653ba
Author: Stefania Alborghetti 
Authored: Thu Nov 24 08:58:40 2016 +0800
Committer: Stefania Alborghetti 
Committed: Thu Nov 24 08:58:40 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/5af71cf6/CHANGES.txt
--

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

[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/b0f51cec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0f51cec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0f51cec

Branch: refs/heads/trunk
Commit: b0f51cecb610af4896ead7ade970a42366298349
Parents: f782f14 d152745
Author: Sam Tunnicliffe 
Authored: Tue Nov 22 17:00:49 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 22 17:00:49 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/b0f51cec/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0f51cec/src/java/org/apache/cassandra/config/ColumnDefinition.java
--

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

[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/58cf4c90
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58cf4c90
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58cf4c90

Branch: refs/heads/trunk
Commit: 58cf4c90742a628853132aacf2333ccc94eb480e
Parents: f1c3aac 075539a
Author: Jason Brown 
Authored: Mon Nov 21 06:47:44 2016 -0800
Committer: Jason Brown 
Committed: Mon Nov 21 06:48:52 2016 -0800

--
 CHANGES.txt |   1 +
 .../repair/messages/AnticompactionRequest.java  |  19 ++
 .../repair/messages/CleanupMessage.java |  17 ++
 .../repair/messages/PrepareMessage.java |  22 +++
 .../repair/messages/SnapshotMessage.java|  16 ++
 .../cassandra/repair/messages/SyncComplete.java |  19 ++
 .../cassandra/repair/messages/SyncRequest.java  |  21 +++
 .../repair/messages/ValidationComplete.java |  18 ++
 .../RepairMessageSerializationsTest.java| 188 +++
 9 files changed, 321 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/58cf4c90/CHANGES.txt
--
diff --cc CHANGES.txt
index 9ad67d1,24641a6..fa9233a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -109,8 -104,8 +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:
++ * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
   * 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)

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

[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/fd7857a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd7857a6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd7857a6

Branch: refs/heads/trunk
Commit: fd7857a64223708790ef16e90f82faff2d692f0a
Parents: 6b9a806 0cb3128
Author: Michael Shuler 
Authored: Wed Nov 16 14:32:26 2016 -0600
Committer: Michael Shuler 
Committed: Wed Nov 16 14:32:26 2016 -0600

--

--

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

[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/9b02ce98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b02ce98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b02ce98

Branch: refs/heads/trunk
Commit: 9b02ce9833db659a54ca3af692fb4bba1eb86a7a
Parents: 65098d0 2f3e07a
Author: Sam Tunnicliffe 
Authored: Mon Nov 14 12:49:25 2016 +
Committer: Sam Tunnicliffe 
Committed: Mon Nov 14 12:49:25 2016 +

--
 conf/cassandra.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

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

[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/e1427e23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1427e23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1427e23

Branch: refs/heads/trunk
Commit: e1427e238e38da21485996da9c681aa72de81ef1
Parents: 1b91cd5 c31463a
Author: Robert Stupp 
Authored: Sun Nov 13 12:57:04 2016 +0100
Committer: Robert Stupp 
Committed: Sun Nov 13 12:57:04 2016 +0100

--
 CHANGES.txt |  5 +++
 .../functions/ThreadAwareSecurityManager.java   | 43 
 .../validation/operations/AggregationTest.java  |  4 +-
 3 files changed, 51 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1427e23/CHANGES.txt
--
diff --cc CHANGES.txt
index f285875,7b59c07..ea757f6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,8 +1,16 @@@
 +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
+ Merged from 3.0:
+  * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
+ 
+ 
  3.10
   * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
   * Fix cassandra-stress truncate option (CASSANDRA-12695)

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

[slebresne]

Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  testall failure in 
org.apache.cassandra.index.internal.CassandraIndexTest.indexOnFirstClusteringColumn


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

Branch: refs/heads/trunk
Commit: 53731dfe2894dfd6584b05803eda59ab48dfa981
Parents: bd2970f a345a81
Author: Sylvain Lebresne 
Authored: Thu Nov 10 16:50:15 2016 +0100
Committer: Sylvain Lebresne 
Committed: Thu Nov 10 16:50:15 2016 +0100

--
 .../org/apache/cassandra/index/internal/CassandraIndexTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

[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/bd2970f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd2970f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd2970f1

Branch: refs/heads/trunk
Commit: bd2970f19f52f495fe39bd3e3002aa4f58891f70
Parents: d568313 0dc8440
Author: Yuki Morishita 
Authored: Thu Nov 10 09:34:46 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Nov 10 09:34:46 2016 -0600

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/io/compress/CompressedSequentialWriter.java | 2 +-
 src/java/org/apache/cassandra/io/util/CompressedChunkReader.java | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2970f1/CHANGES.txt
--
diff --cc CHANGES.txt
index 69a05c2,e765a9c..9678ca1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -107,8 -99,9 +107,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:
+  * 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)
   * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)

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

[marcuse]

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/d5683134
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5683134
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5683134

Branch: refs/heads/trunk
Commit: d56831346e5001fa7107c49a9c0465a0761fd3de
Parents: 97eeb66 a07d7ac
Author: Marcus Eriksson 
Authored: Thu Nov 10 15:47:15 2016 +0100
Committer: Marcus Eriksson 
Committed: Thu Nov 10 15:47:15 2016 +0100

--

--

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

[slebresne]

Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  Batch with multiple conditional updates for the same partition causes 
AssertionError


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

Branch: refs/heads/trunk
Commit: c47d395d86d44a5ad48434a320826de3c1eb4a2b
Parents: 0e132f4 2b45673
Author: Sylvain Lebresne 
Authored: Mon Nov 7 14:10:54 2016 +0100
Committer: Sylvain Lebresne 
Committed: Mon Nov 7 14:10:54 2016 +0100

--
 CHANGES.txt |   1 +
 .../cql3/statements/CQL3CasRequest.java |  27 -
 .../operations/InsertUpdateIfConditionTest.java | 104 +++
 3 files changed, 127 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c47d395d/CHANGES.txt
--
diff --cc CHANGES.txt
index 446d550,1123553..bbe79e6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -105,8 -97,9 +105,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:
+  * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
   * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
   * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
   * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)

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

[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/0e132f4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e132f4e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e132f4e

Branch: refs/heads/trunk
Commit: 0e132f4ebce58f7ba2b2194e92917d2b8243e011
Parents: 67a2a5e 9b42974
Author: Jeff Jirsa 
Authored: Sun Nov 6 20:42:59 2016 -0800
Committer: Jeff Jirsa 
Committed: Sun Nov 6 20:43:55 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e132f4e/CHANGES.txt
--
diff --cc CHANGES.txt
index 913fdf0,ab34d46..446d550
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -105,8 -97,9 +105,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:
+  * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
   * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
   * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
   * Avoid deadlock due to MV lock contention (CASSANDRA-12689)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e132f4e/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
--

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

[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/67a2a5eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67a2a5eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67a2a5eb

Branch: refs/heads/trunk
Commit: 67a2a5eb343b3cee7e74f0f64e4833ad393159ad
Parents: 9ed4fac 91208b6
Author: Jeff Jirsa 
Authored: Sun Nov 6 20:24:33 2016 -0800
Committer: Jeff Jirsa 
Committed: Sun Nov 6 20:26:15 2016 -0800

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/dht/RangeStreamer.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/67a2a5eb/CHANGES.txt
--
diff --cc CHANGES.txt
index 5eb2850,47c8a1d..913fdf0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -105,8 -97,9 +105,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:
+  * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
   * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
   * Avoid deadlock due to MV lock contention (CASSANDRA-12689)
   * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)

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

[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/9ed4face
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ed4face
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ed4face

Branch: refs/heads/trunk
Commit: 9ed4faceb36b35a04e32d8adc4d7f7c35d6ff74d
Parents: 22a3db0 80843c9
Author: Stefania Alborghetti 
Authored: Mon Nov 7 10:33:43 2016 +0800
Committer: Stefania Alborghetti 
Committed: Mon Nov 7 10:33:43 2016 +0800

--
 CHANGES.txt |  1 +
 .../apache/cassandra/schema/KeyspaceParams.java | 11 +++-
 .../cassandra/db/commitlog/CommitLogTest.java   | 29 ++--
 3 files changed, 38 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ed4face/CHANGES.txt
--
diff --cc CHANGES.txt
index fb16d4b,3157e8e..5eb2850
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -105,8 -97,9 +105,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:
+  * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
   * Avoid deadlock due to MV lock contention (CASSANDRA-12689)
   * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
   * Include SSTable filename in compacting large row message (CASSANDRA-12384)

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

[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/8abb632c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8abb632c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8abb632c

Branch: refs/heads/trunk
Commit: 8abb632c4676af5042b259341b89d1048e38724d
Parents: e84a8f3 ccac7ef
Author: Michael Shuler 
Authored: Mon Oct 31 10:35:33 2016 -0500
Committer: Michael Shuler 
Committed: Mon Oct 31 10:35:33 2016 -0500

--

--

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

[tylerhobbs]

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/6f1ce682
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f1ce682
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f1ce682

Branch: refs/heads/trunk
Commit: 6f1ce6823088e9eeb28f6928bed44050024a1f25
Parents: 9e8b7c0 0a1f1c8
Author: Tyler Hobbs 
Authored: Fri Oct 28 15:41:12 2016 -0500
Committer: Tyler Hobbs 
Committed: Fri Oct 28 15:41:12 2016 -0500

--
 CHANGES.txt |   1 +
 .../cassandra/config/DatabaseDescriptor.java|   2 +-
 src/java/org/apache/cassandra/db/Keyspace.java  | 110 ++-
 src/java/org/apache/cassandra/db/Mutation.java  |  12 +-
 .../cassandra/service/paxos/PaxosState.java |   2 +-
 5 files changed, 92 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f1ce682/CHANGES.txt
--
diff --cc CHANGES.txt
index a6410d9,82d3d9c..264f8d5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -102,8 -94,9 +102,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:
+  * Avoid deadlock due to MV lock contention (CASSANDRA-12689)
   * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
   * Include SSTable filename in compacting large row message (CASSANDRA-12384)
   * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)

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

[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/b921ddf2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b921ddf2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b921ddf2

Branch: refs/heads/trunk
Commit: b921ddf2fc44bc446f932195c433d87ea7179983
Parents: fc3b9bf 3cb0233
Author: Stefania Alborghetti 
Authored: Tue Oct 25 09:57:48 2016 +0800
Committer: Stefania Alborghetti 
Committed: Tue Oct 25 09:57:48 2016 +0800

--
 CHANGES.txt |  1 +
 .../apache/cassandra/schema/CachingParams.java  |  4 +-
 .../org/apache/cassandra/cql3/CQLTester.java| 20 --
 .../apache/cassandra/cql3/KeyCacheCqlTest.java  | 76 
 4 files changed, 81 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b921ddf2/CHANGES.txt
--
diff --cc CHANGES.txt
index 2405f48,d1f2677..8504e0b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -95,8 -86,9 +95,9 @@@ Merged from 3.0
   * 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:
+  * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
   * Include SSTable filename in compacting large row message (CASSANDRA-12384)
   * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
   * Fix ViewTest.testCompaction (CASSANDRA-12789)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b921ddf2/test/unit/org/apache/cassandra/cql3/CQLTester.java
--

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

[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/4f8a1c89
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f8a1c89
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f8a1c89

Branch: refs/heads/trunk
Commit: 4f8a1c89b58bbd0fde9f2338c05ec1917b5e9ebc
Parents: 65405b9 26ee16b
Author: Yuki Morishita 
Authored: Thu Oct 20 10:41:00 2016 -0500
Committer: Yuki Morishita 
Committed: Thu Oct 20 10:41:00 2016 -0500

--
 .../apache/cassandra/streaming/DefaultConnectionFactory.java   | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)
--

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

[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/cb8e951b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb8e951b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb8e951b

Branch: refs/heads/trunk
Commit: cb8e951b29795ef2072c858686f7fe478423dae3
Parents: e6e82a7 d8c8366
Author: Jeff Jirsa 
Authored: Wed Oct 19 21:02:26 2016 -0700
Committer: Jeff Jirsa 
Committed: Wed Oct 19 21:02:26 2016 -0700

--

--

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

[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/2d559fda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d559fda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d559fda

Branch: refs/heads/trunk
Commit: 2d559fda51eff3c672687ade986983f5f6c1bbbd
Parents: 7b756cc 7886bd3
Author: Stefania Alborghetti 
Authored: Thu Oct 20 09:21:14 2016 +0800
Committer: Stefania Alborghetti 
Committed: Thu Oct 20 09:21:14 2016 +0800

--

--

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

[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/5b6dee9c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b6dee9c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b6dee9c

Branch: refs/heads/trunk
Commit: 5b6dee9c5053c010c1fae9095ea200e1184e33e6
Parents: 3535ed5 1f19d1a
Author: Stefania Alborghetti 
Authored: Wed Oct 19 09:47:45 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Oct 19 09:47:45 2016 +0800

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/lifecycle/ViewTest.java | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b6dee9c/CHANGES.txt
--
diff --cc CHANGES.txt
index 95fb1d3,30caf4f..0a72c50
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -91,8 -84,9 +91,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:
+  * Fix ViewTest.testCompaction (CASSANDRA-12789)
   * Improve avg aggregate functions (CASSANDRA-12417)
   * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
   * nodetool stopdaemon errors out (CASSANDRA-12646)

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

[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/3535ed55
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3535ed55
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3535ed55

Branch: refs/heads/trunk
Commit: 3535ede8f512deef01df171cd830069a2eba
Parents: 4d7918d 72d0c81
Author: Jeff Jirsa 
Authored: Tue Oct 18 18:12:38 2016 -0700
Committer: Jeff Jirsa 
Committed: Tue Oct 18 18:15:02 2016 -0700

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


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

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

[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/b51f7e25
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b51f7e25
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b51f7e25

Branch: refs/heads/trunk
Commit: b51f7e25977cc82a54be24bb254ff3fa82b11795
Parents: e66305d f5bc378
Author: Carl Yeksigian 
Authored: Mon Oct 17 16:16:55 2016 -0400
Committer: Carl Yeksigian 
Committed: Mon Oct 17 16:16:55 2016 -0400

--
 .../apache/cassandra/cql3/ReservedKeywords.java | 28 ++---
 .../cassandra/cql3/ReservedKeywordsTest.java| 43 
 2 files changed, 46 insertions(+), 25 deletions(-)
--

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

[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/58d2b5f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58d2b5f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58d2b5f4

Branch: refs/heads/trunk
Commit: 58d2b5f49f81ab573d07eaceac7150ca95d44db4
Parents: a48ebbc 7234c79
Author: Robert Stupp 
Authored: Thu Oct 13 15:20:37 2016 +0200
Committer: Robert Stupp 
Committed: Thu Oct 13 15:20:37 2016 +0200

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


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

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

[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/9f75e706
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f75e706
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f75e706

Branch: refs/heads/trunk
Commit: 9f75e706871aaeac749e45d2dd226b99950ce436
Parents: cd728d2 541d837
Author: Carl Yeksigian 
Authored: Wed Oct 12 12:34:16 2016 -0400
Committer: Carl Yeksigian 
Committed: Wed Oct 12 12:34:16 2016 -0400

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/view/TableViews.java| 91 +---
 .../apache/cassandra/db/view/ViewBuilder.java   | 11 ++-
 .../cassandra/db/view/ViewUpdateGenerator.java  |  8 ++
 4 files changed, 93 insertions(+), 18 deletions(-)
--


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

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

[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/cd728d2e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd728d2e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd728d2e

Branch: refs/heads/trunk
Commit: cd728d2e735643b266303ae3adc8aeccad1e080b
Parents: 0b82c4f f1b742e
Author: Robert Stupp 
Authored: Wed Oct 12 13:45:27 2016 +0200
Committer: Robert Stupp 
Committed: Wed Oct 12 13:45:27 2016 +0200

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


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

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

[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/9f167492
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f167492
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f167492

Branch: refs/heads/trunk
Commit: 9f167492621519c4a991804b271cb6445323a9c1
Parents: 07bc404 e0a35e5
Author: Stefania Alborghetti 
Authored: Tue Oct 11 11:26:53 2016 +0800
Committer: Stefania Alborghetti 
Committed: Tue Oct 11 11:26:53 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 50 +
 2 files changed, 42 insertions(+), 9 deletions(-)
--


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

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

[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/03e2e0a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03e2e0a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03e2e0a1

Branch: refs/heads/trunk
Commit: 03e2e0a178034f509acf52ecaeaf796e589dca58
Parents: 29c5fe6 37551e9
Author: Stefania Alborghetti 
Authored: Mon Oct 10 09:53:56 2016 +0800
Committer: Stefania Alborghetti 
Committed: Mon Oct 10 09:53:56 2016 +0800

--
 CHANGES.txt   |  1 +
 src/java/org/apache/cassandra/config/CFMetaData.java  | 14 --
 .../org/apache/cassandra/db/SerializationHeader.java  |  3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/03e2e0a1/src/java/org/apache/cassandra/config/CFMetaData.java
--

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

[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/700a1dcb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/700a1dcb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/700a1dcb

Branch: refs/heads/trunk
Commit: 700a1dcb555f5de01fd80e2f53e5b8e905e43efe
Parents: 49b0805 8c95d37
Author: Aleksey Yeschenko 
Authored: Tue Oct 4 16:23:10 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Oct 4 16:23:10 2016 +0100

--
 CHANGES.txt   |  1 +
 .../cassandra/io/sstable/StressCQLSSTableWriter.java  |  8 +---
 .../src/org/apache/cassandra/stress/Stress.java   |  2 +-
 .../org/apache/cassandra/stress/StressProfile.java| 14 +++---
 4 files changed, 14 insertions(+), 11 deletions(-)
--


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

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

[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/49b0805c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49b0805c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49b0805c

Branch: refs/heads/trunk
Commit: 49b0805c2a1e779d766085a1178837f0b3081971
Parents: c819cb8 af60ca9
Author: Aleksey Yeschenko 
Authored: Tue Oct 4 14:37:32 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Oct 4 14:37:32 2016 +0100

--
 CHANGES.txt| 1 +
 .../apache/cassandra/dht/tokenallocator/TokenAllocation.java   | 6 +++---
 test/unit/org/apache/cassandra/dht/BootStrapperTest.java   | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/49b0805c/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
--
diff --cc test/unit/org/apache/cassandra/dht/BootStrapperTest.java
index 715f7dd,3af52e5..ab0beb8
--- a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
+++ b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
@@@ -179,15 -178,8 +179,15 @@@ public class BootStrapperTes
  int vn = 16;
  String ks = "BootStrapperTestNTSKeyspace" + rackCount + replicas;
  String dc = "1";
 +
 +// Register peers with expected DC for NetworkTopologyStrategy.
 +TokenMetadata metadata = 
StorageService.instance.getTokenMetadata();
 +metadata.clearUnsafe();
 +metadata.updateHostId(UUID.randomUUID(), 
InetAddress.getByName("127.1.0.99"));
 +metadata.updateHostId(UUID.randomUUID(), 
InetAddress.getByName("127.15.0.99"));
 +
  SchemaLoader.createKeyspace(ks, KeyspaceParams.nts(dc, replicas, 
"15", 15), SchemaLoader.standardCFMD(ks, "Standard1"));
- TokenMetadata tm = new TokenMetadata();
+ TokenMetadata tm = StorageService.instance.getTokenMetadata();
  tm.clearUnsafe();
  for (int i = 0; i < rackCount; ++i)
  generateFakeEndpoints(tm, 10, vn, dc, Integer.toString(i));

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

[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/723d055d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/723d055d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/723d055d

Branch: refs/heads/trunk
Commit: 723d055d81d7cbfc16b79bdeebcd79523bc35719
Parents: dbd7839 2e18adf
Author: Stefania Alborghetti 
Authored: Tue Oct 4 09:55:56 2016 +0800
Committer: Stefania Alborghetti 
Committed: Tue Oct 4 09:55:56 2016 +0800

--
 CHANGES.txt |   1 +
 conf/logback.xml|   3 +-
 .../DebuggableScheduledThreadPoolExecutor.java  |   2 +-
 .../apache/cassandra/service/StorageProxy.java  |   8 +-
 .../cassandra/service/StorageService.java   | 285 ++-
 .../cassandra/service/StorageServiceMBean.java  |   2 +
 .../org/apache/cassandra/tools/NodeProbe.java   |  10 +
 .../cql3/validation/entities/UFTest.java|   4 +-
 8 files changed, 178 insertions(+), 137 deletions(-)
--


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

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

[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/dbd78391
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dbd78391
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dbd78391

Branch: refs/heads/trunk
Commit: dbd78391717b3f0fc640e04c6849de3d677a759a
Parents: cf04fef c089b26
Author: Stefania Alborghetti 
Authored: Tue Oct 4 09:17:45 2016 +0800
Committer: Stefania Alborghetti 
Committed: Tue Oct 4 09:17:45 2016 +0800

--
 CHANGES.txt |  1 +
 .../db/SinglePartitionSliceCommandTest.java | 21 
 2 files changed, 22 insertions(+)
--


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