Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b3b3ca0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b3b3ca0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b3b3ca0
Branch: refs/heads/trunk
Commit: 9b3b3ca00f71a4ae38149194e3c8c7c448974275
Parents: a0076e7 a90c3b2
Author: Tyler Hobbs <[email protected]>
Authored: Wed Nov 25 11:57:24 2015 -0600
Committer: Tyler Hobbs <[email protected]>
Committed: Wed Nov 25 11:57:24 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b3b3ca0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 513e682,5ff53b6..f95f079
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -13,7 -3,17 +13,8 @@@ Merged from 2.2
* 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) Print column names before COPY operation (CASSANDRA-8935)
- * Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
* Try next replica if not possible to connect to primary replica on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b3b3ca0/bin/cqlsh.py
----------------------------------------------------------------------
