cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Wed, 14 Oct 2015 14:21:20 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/751e4f9e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/751e4f9e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/751e4f9e

Branch: refs/heads/cassandra-2.2
Commit: 751e4f9e0d9ea23dd8ee31ef4610f4cc7e6ca68b
Parents: 8959668 626ac94
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Oct 14 15:21:08 2015 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Oct 14 15:21:08 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/751e4f9e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3641afc,cd2a779..6aa16bc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,8 +1,15 @@@
 -2.1.12
 -  * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
++2.2.4
++Merged from 2.1:
++ * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
+ 
+ 
 -2.1.11
 +2.2.3
 + * Avoid NoClassDefFoundError during DataDescriptor initialization on windows (CASSANDRA-10412)
 + * Preserve case of quoted Role & User names (CASSANDRA-10394)
 + * cqlsh pg-style-strings broken (CASSANDRA-10484)
 + * Make Hadoop CF splits more polite to custom orderered partitioners (CASSANDRA-10400)
 + * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
 +Merged from 2.1:
   * Fix mmap file segment seeking to EOF (CASSANDRA-10478)
   * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275)
   * Mark nodes as dead even if they've already left (CASSANDRA-10205)


Mime
View raw message