[14/19] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[mshuler]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: c07441251335b0c305f7c674ead58cd5fb898e7f
Parents: e400b97 797de4a
Author: Michael Shuler 
Authored: Thu Oct 5 10:23:15 2017 -0500
Committer: Michael Shuler 
Committed: Thu Oct 5 10:23:15 2017 -0500

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[14/19] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[mshuler]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: a5a744693a59a32f8e77ad4f6df282bf9a1c4041
Parents: f3e38cb 83f28ce
Author: Michael Shuler 
Authored: Wed Jun 21 14:09:15 2017 -0500
Committer: Michael Shuler 
Committed: Wed Jun 21 14:09:15 2017 -0500

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[14/19] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[stefania]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: f99f8a8c823c01cc5ef781fdf36ecc4725f4d947
Parents: 4aaf2b3 43e9d29
Author: Stefania Alborghetti 
Authored: Wed Jun 1 15:32:48 2016 +0200
Committer: Stefania Alborghetti 
Committed: Wed Jun 1 15:32:48 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f99f8a8c/CHANGES.txt
--
diff --cc CHANGES.txt
index 4cdc031,ffd5b31..07845a6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -16,39 -3,9 +16,40 @@@ Merged from 2.2
   * Fix possible race condition in CommitLog.recover (CASSANDRA-11743)
   * Enable client encryption in sstableloader with cli options 
(CASSANDRA-11708)
   * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
 - * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
   * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 - * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
 + * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
 +Merged from 2.1:
++ * cqlsh: apply current keyspace to source command (CASSANDRA-11152)
 + * Backport CASSANDRA-11578 (CASSANDRA-11750)
 + * Clear out parent repair session if repair coordinator dies 
(CASSANDRA-11824)
 + * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840)
 + * Do not consider local node a valid source during replace (CASSANDRA-11848)
 + * Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
 + * Avoid holding SSTableReaders for duration of incremental repair 
(CASSANDRA-11739)
 +
 +
 +3.0.6
 + * Disallow creating view with a static column (CASSANDRA-11602)
 + * Reduce the amount of object allocations caused by the getFunctions methods 
(CASSANDRA-11593)
 + * Potential error replaying commitlog with smallint/tinyint/date/time types 
(CASSANDRA-11618)
 + * Fix queries with filtering on counter columns (CASSANDRA-11629)
 + * Improve tombstone printing in sstabledump (CASSANDRA-11655)
 + * Fix paging for range queries where all clustering columns are specified 
(CASSANDRA-11669)
 + * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600)
 + * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
 + * Ignore all LocalStrategy keyspaces for streaming and other related
 +   operations (CASSANDRA-11627)
 + * Ensure columnfilter covers indexed columns for thrift 2i queries 
(CASSANDRA-11523)
 + * Only open one sstable scanner per sstable (CASSANDRA-11412)
 + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
 + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
 + * LogAwareFileLister should only use OLD sstable files in current folder to 
determine disk consistency (CASSANDRA-11470)
 + * Notify indexers of expired rows during compaction (CASSANDRA-11329)
 + * Properly respond with ProtocolError when a v1/v2 native protocol
 +   header is received (CASSANDRA-11464)
 + * Validate that num_tokens and initial_token are consistent with one another 
(CASSANDRA-10120)
 +Merged from 2.2:
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
   * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
   * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
   * Produce a heap dump when exiting on OOM (CASSANDRA-9861)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f99f8a8c/bin/cqlsh.py
--

[14/19] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[carl]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: a942b2ceb8fcd9edb6d99a15406b2018426c4f48
Parents: 4c7b06b a6e5cda
Author: Carl Yeksigian 
Authored: Tue Jan 12 12:27:41 2016 -0500
Committer: Carl Yeksigian 
Committed: Tue Jan 12 12:27:41 2016 -0500

--
 CHANGES.txt   |  3 ++-
 .../apache/cassandra/io/sstable/format/SSTableReader.java | 10 +-
 2 files changed, 11 insertions(+), 2 deletions(-)
--


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

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

[14/19] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jmckenzie]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: cb102da9e1ca9899e7e1f0808cb418425d2c7448
Parents: ed424bd 73a730f
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:57:55 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:57:55 2015 -0500

--
 .../apache/cassandra/io/compress/CompressionMetadata.java| 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb102da9/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
--