cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [4/7] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Thu, 19 Nov 2015 00:32:37 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/d2f243ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2f243ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2f243ee

Branch: refs/heads/trunk
Commit: d2f243ee5c656eb51053e553d7371802255dfc54
Parents: d09b6c6 1b629c1
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Wed Nov 18 18:25:18 2015 -0600
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Wed Nov 18 18:25:18 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                  |   1 +
 bin/cqlsh.py                 | 153 +++------
 pylib/cqlshlib/copy.py       | 647 ++++++++++++++++++++++++++++++++++++++
 pylib/cqlshlib/displaying.py |  10 +
 pylib/cqlshlib/formatting.py |  32 +-
 5 files changed, 725 insertions(+), 118 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2f243ee/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c3dacc2,42dcf3e..4e19b23
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 -2.1.12
 - * (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304)
 +2.2.4
 + * Don't do anticompaction after subrange repair (CASSANDRA-10422)
 + * Fix SimpleDateType type compatibility (CASSANDRA-10027)
 + * (Hadoop) fix splits calculation (CASSANDRA-10640)
 + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 + * (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) Improve COPY TO performance and error handling (CASSANDRA-9304)
   * Don't remove level info when running upgradesstables (CASSANDRA-10692)
   * Create compression chunk for sending file only (CASSANDRA-10680)
   * Make buffered read size configurable (CASSANDRA-10249)


Mime
View raw message