You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/11/06 16:26:38 UTC
[4/4] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
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/cfbe2d35
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfbe2d35
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfbe2d35
Branch: refs/heads/cassandra-3.0
Commit: cfbe2d35b0402f8272ed562a99ff462283117d9a
Parents: 5343a75 edca4dc
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Nov 6 15:26:14 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Nov 6 15:26:14 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfbe2d35/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 146ee73,c33b8c9..c39f119
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,7 -3,11 +35,8 @@@ Merged from 2.2
* 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)
* Fix logback-tools.xml incorrectly configured for outputing to System.err
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfbe2d35/bin/cqlsh.py
----------------------------------------------------------------------