cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [4/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Fri, 06 Nov 2015 18:39:55 GMT
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/cb429063
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb429063
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb429063

Branch: refs/heads/cassandra-3.0
Commit: cb429063c1a4ec2b8d48d6e4e6e8a2f524033df7
Parents: edca4dc 2548365
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Nov 6 17:56:33 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Nov 6 17:56:33 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                       |   2 +-
 bin/cqlsh.py                                      |   6 +++---
 ...driver-internal-only-3.0.0a2.post0-95c6008.zip | Bin 233564 -> 0 bytes
 ...driver-internal-only-3.0.0a3.post0-c535450.zip | Bin 0 -> 233938 bytes
 pylib/cqlshlib/tracing.py                         |   8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb429063/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c33b8c9,7771969..f47e1dd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,4 +1,13 @@@
 -2.1.12
 +2.2.4
++ * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
 + * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
   * (cqlsh) fix COPY using wrong variable name for time_format (CASSANDRA-10633)
   * Do not run SizeEstimatesRecorder if a node is not a member of the ring (CASSANDRA-9912)
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)


Mime
View raw message