[11/19] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2017-06-21 Thread mshuler 
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.11
Commit: 83f28ce3c4eeff75ce70855a56b6155047ce8e9a
Parents: c9d3b30 9369db1
Author: Michael Shuler 
Authored: Wed Jun 21 14:08:38 2017 -0500
Committer: Michael Shuler 
Committed: Wed Jun 21 14:08:38 2017 -0500

--

--



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

[11/19] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2016-06-01 Thread stefania 
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: 43e9d2936e1d352b98433ecb1d3c2608e641870e
Parents: 39b86e3 4008e9b
Author: Stefania Alborghetti 
Authored: Wed Jun 1 15:30:42 2016 +0200
Committer: Stefania Alborghetti 
Committed: Wed Jun 1 15:30:57 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/43e9d293/CHANGES.txt
--
diff --cc CHANGES.txt
index 7c66125,a437322..ffd5b31
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 -2.1.15
 +2.2.7
 + * Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
 + * 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)
 + * 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)
 + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
 + * Restore ability to filter on clustering columns when using a 2i 
(CASSANDRA-11510)
 + * JSON datetime formatting needs timezone (CASSANDRA-11137)
 + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)
 + * Remove unnescessary file existence check during anticompaction 
(CASSANDRA-11660)
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +   report errors correctly if workers processes crash on initialization 
(CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988)
 +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)

[11/19] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2016-01-12 Thread carl 
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: a6e5cdaefc034fcd3069bc0db5bed40fce91aafe
Parents: e8bd8a4 10bbcfc
Author: Carl Yeksigian 
Authored: Tue Jan 12 12:27:24 2016 -0500
Committer: Carl Yeksigian 
Committed: Tue Jan 12 12:27:24 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/a6e5cdae/CHANGES.txt
--
diff --cc CHANGES.txt
index 50d5f60,6f567ee..477a104
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,11 +1,25 @@@
 -2.1.13
 +2.2.5
 + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
 + * Enable GC logging by default (CASSANDRA-10140)
 + * Optimize pending range computation (CASSANDRA-9258)
 + * Skip commit log and saved cache directories in SSTable version startup 
check (CASSANDRA-10902)
 + * drop/alter user should be case sensitive (CASSANDRA-10817)
 + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 + * Support counter-columns for native aggregates (sum,avg,max,min) 
(CASSANDRA-9977)
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 +Merged from 2.1:
+  * If CompactionMetadata is not in stats file, use index summary instead 
(CASSANDRA-10676)
   * Retry sending gossip syn multiple times during shadow round 
(CASSANDRA-8072)
   * Fix pending range calculation during moves (CASSANDRA-10887)
-  * Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
+  * Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-8708)
   * Match cassandra-loader options in COPY FROM (CASSANDRA-9303)
   * Fix binding to any address in CqlBulkRecordWriter (CASSANDRA-9309)
 - * Fix the way we replace sstables after anticompaction (CASSANDRA-10831)
   * cqlsh fails to decode utf-8 characters for text typed columns 
(CASSANDRA-10875)
   * Log error when stream session fails (CASSANDRA-9294)
   * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)