cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [05/10] cassandra git commit: merge from 2.1
Date Tue, 25 Aug 2015 01:10:33 GMT
merge from 2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1992598e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1992598e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1992598e

Branch: refs/heads/cassandra-3.0
Commit: 1992598ecc28da78ebda070aace08c3fe9e6ea43
Parents: e667993 f5d0595
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Aug 24 20:09:22 2015 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Aug 24 20:09:22 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt            | 1 +
 pylib/cqlshlib/util.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1992598e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 28fe8a2,2d11d55..664a23e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 -2.1.9
 +2.2.1
 + * add CLEAR cqlsh command (CASSANDRA-10086)
 + * Support string literals as Role names for compatibility (CASSANDRA-10135)
 + * Allow count(*) and count(1) to be use as normal aggregation (CASSANDRA-10114)
 + * An NPE is thrown if the column name is unknown for an IN relation (CASSANDRA-10043)
 + * Apply commit_failure_policy to more errors on startup (CASSANDRA-9749)
 + * Fix histogram overflow exception (CASSANDRA-9973)
 + * Route gossip messages over dedicated socket (CASSANDRA-9237)
 + * Add checksum to saved cache files (CASSANDRA-9265)
 + * Log warning when using an aggregate without partition key (CASSANDRA-9737)
 + * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
 + * UDF / UDA execution time in trace (CASSANDRA-9723)
 + * Fix broken internode SSL (CASSANDRA-9884)
 +Merged from 2.1:
+  * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
   * Avoid returning Permission.None when system_auth.permissions table does not
     exist (CASSANDRA-10168)
   * (cqlsh) Allow encoding to be set through command line (CASSANDRA-10004)


Mime
View raw message