Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
pylib/cqlshlib/cql3handling.py
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/134bcda0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/134bcda0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/134bcda0
Branch: refs/heads/trunk
Commit: 134bcda0cd780a298c087733b44edbbbbd7315bf
Parents: d526536 386f197
Author: Tyler Hobbs <tylerlho...@gmail.com>
Authored: Tue Aug 25 09:57:18 2015 -0500
Committer: Tyler Hobbs <tylerlho...@gmail.com>
Committed: Tue Aug 25 09:57:18 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
pylib/cqlshlib/cql3handling.py | 38 ++++++++++---------------------------
pylib/cqlshlib/cqlhandling.py | 12 ++----------
3 files changed, 14 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/134bcda0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3065d0b,92dcf59..97d8b8b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
-2.1.9
+2.2.1
- * add CLEAR cqlsh command (CASSANDRA-10086)
++ * (cqlsh) add CLEAR 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) update list of CQL keywords (CASSANDRA-9232)
* Avoid race condition during read repair (CASSANDRA-9460)
* (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
* Avoid returning Permission.NONE when failing to query users table
(CASSANDRA-10168)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/134bcda0/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/134bcda0/pylib/cqlshlib/cqlhandling.py
----------------------------------------------------------------------
