cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [3/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Wed, 09 Sep 2015 22:18:05 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/b2b75601
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2b75601
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2b75601

Branch: refs/heads/cassandra-3.0
Commit: b2b756013a0f39c61173ae512e7e30ec33574daa
Parents: ec4b4d4 acc08ae
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Wed Sep 9 17:16:29 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Wed Sep 9 17:16:29 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt  | 1 +
 bin/cqlsh.py | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2b75601/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d74337e,ba4347e..d49ab3d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -2.1.10
 +2.2.2
 + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) 
 + * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222)
 + * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
 + * Fix repair hang when snapshot failed (CASSANDRA-10057)
 + * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 +   (CASSANDRA-10199)
 +Merged from 2.1:
+  * (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282)
   * Scrub, Cleanup and Upgrade do not unmark compacting until all operations
     have completed, regardless of the occurence of exceptions (CASSANDRA-10274)
   * Fix handling of streaming EOF (CASSANDRA-10206)


Mime
View raw message