You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2015/08/25 03:10:29 UTC
[01/10] cassandra git commit: (cqlsh) default load-from-file encoding
to utf-8 patch by Yasuharu Goto; reviewed by Carl Yeksigian for CASSANDRA-9898
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 447d605b1 -> f5d0595b6
refs/heads/cassandra-2.2 e667993b9 -> 1992598ec
refs/heads/cassandra-3.0 27a97a5cf -> ee9807e3a
refs/heads/trunk 32c841598 -> 5d1102146
(cqlsh) default load-from-file encoding to utf-8
patch by Yasuharu Goto; reviewed by Carl Yeksigian for CASSANDRA-9898
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5d0595b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5d0595b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5d0595b
Branch: refs/heads/cassandra-2.1
Commit: f5d0595b6e0fd3e3bae794c3d5f8016399f6c478
Parents: 447d605
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 24 20:08:51 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 24 20:08:51 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/f5d0595b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 45e59f7..2d11d55 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.9
+ * (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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5d0595b/pylib/cqlshlib/util.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/util.py b/pylib/cqlshlib/util.py
index 4273efc..dfa480d 100644
--- a/pylib/cqlshlib/util.py
+++ b/pylib/cqlshlib/util.py
@@ -118,6 +118,6 @@ def get_file_encoding_bomsize(filename):
file_encoding, size = encoding, len(bom)
break
else:
- file_encoding, size = "ascii", 0
+ file_encoding, size = "utf-8", 0
return (file_encoding, size)
[05/10] cassandra git commit: merge from 2.1
Posted by jb...@apache.org.
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 <jb...@apache.org>
Authored: Mon Aug 24 20:09:22 2015 -0500
Committer: Jonathan Ellis <jb...@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)
[07/10] cassandra git commit: merge from 2.1
Posted by jb...@apache.org.
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/trunk
Commit: 1992598ecc28da78ebda070aace08c3fe9e6ea43
Parents: e667993 f5d0595
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 24 20:09:22 2015 -0500
Committer: Jonathan Ellis <jb...@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)
[03/10] cassandra git commit: (cqlsh) default load-from-file encoding
to utf-8 patch by Yasuharu Goto; reviewed by Carl Yeksigian for CASSANDRA-9898
Posted by jb...@apache.org.
(cqlsh) default load-from-file encoding to utf-8
patch by Yasuharu Goto; reviewed by Carl Yeksigian for CASSANDRA-9898
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5d0595b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5d0595b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5d0595b
Branch: refs/heads/cassandra-3.0
Commit: f5d0595b6e0fd3e3bae794c3d5f8016399f6c478
Parents: 447d605
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 24 20:08:51 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 24 20:08:51 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/f5d0595b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 45e59f7..2d11d55 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.9
+ * (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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5d0595b/pylib/cqlshlib/util.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/util.py b/pylib/cqlshlib/util.py
index 4273efc..dfa480d 100644
--- a/pylib/cqlshlib/util.py
+++ b/pylib/cqlshlib/util.py
@@ -118,6 +118,6 @@ def get_file_encoding_bomsize(filename):
file_encoding, size = encoding, len(bom)
break
else:
- file_encoding, size = "ascii", 0
+ file_encoding, size = "utf-8", 0
return (file_encoding, size)
[04/10] cassandra git commit: (cqlsh) default load-from-file encoding
to utf-8 patch by Yasuharu Goto; reviewed by Carl Yeksigian for CASSANDRA-9898
Posted by jb...@apache.org.
(cqlsh) default load-from-file encoding to utf-8
patch by Yasuharu Goto; reviewed by Carl Yeksigian for CASSANDRA-9898
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5d0595b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5d0595b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5d0595b
Branch: refs/heads/trunk
Commit: f5d0595b6e0fd3e3bae794c3d5f8016399f6c478
Parents: 447d605
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 24 20:08:51 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 24 20:08:51 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/f5d0595b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 45e59f7..2d11d55 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.9
+ * (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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5d0595b/pylib/cqlshlib/util.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/util.py b/pylib/cqlshlib/util.py
index 4273efc..dfa480d 100644
--- a/pylib/cqlshlib/util.py
+++ b/pylib/cqlshlib/util.py
@@ -118,6 +118,6 @@ def get_file_encoding_bomsize(filename):
file_encoding, size = encoding, len(bom)
break
else:
- file_encoding, size = "ascii", 0
+ file_encoding, size = "utf-8", 0
return (file_encoding, size)
[08/10] cassandra git commit: merge from 2.2
Posted by jb...@apache.org.
merge from 2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee9807e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee9807e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee9807e3
Branch: refs/heads/cassandra-3.0
Commit: ee9807e3ac15bfa79483e53ac3c0160b36a1486b
Parents: 27a97a5 1992598
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 24 20:10:14 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 24 20:10:14 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/ee9807e3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 62ee818,664a23e..b14a5a6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,6 +1,39 @@@
-2.2.1
+3.0.0-beta2
+ * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061)
+ * Reuse TemporalRow when updating multiple MaterializedViews (CASSANDRA-10060)
+ * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
+ * Fix sstablerepairedset (CASSANDRA-10132)
+Merged from 2.2:
++ * (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)
* add CLEAR cqlsh command (CASSANDRA-10086)
* Support string literals as Role names for compatibility (CASSANDRA-10135)
+
+
+3.0.0-beta1
+ * Redesign secondary index API (CASSANDRA-9459, 7771, 9041)
+ * Fix throwing ReadFailure instead of ReadTimeout on range queries (CASSANDRA-10125)
+ * Rewrite hinted handoff (CASSANDRA-6230)
+ * Fix query on static compact tables (CASSANDRA-10093)
+ * Fix race during construction of commit log (CASSANDRA-10049)
+ * Add option to only purge repaired tombstones (CASSANDRA-6434)
+ * Change authorization handling for MVs (CASSANDRA-9927)
+ * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)
+ * Fix row deletion bug for Materialized Views (CASSANDRA-10014)
+ * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704)
+ * Fix multiple slices on RowSearchers (CASSANDRA-10002)
+ * Fix bug in merging of collections (CASSANDRA-10001)
+ * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
+ * Repair improvements when using vnodes (CASSANDRA-5220)
+ * Disable scripted UDFs by default (CASSANDRA-9889)
+ * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
+ * Use byte to serialize MT hash length (CASSANDRA-9792)
+ * Replace usage of Adler32 with CRC32 (CASSANDRA-8684)
+ * Fix migration to new format from 2.1 SSTable (CASSANDRA-10006)
+ * SequentialWriter should extend BufferedDataOutputStreamPlus (CASSANDRA-9500)
+ * Use the same repairedAt timestamp within incremental repair session (CASSANDRA-9111)
+Merged from 2.2:
* 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)
[09/10] cassandra git commit: merge from 2.2
Posted by jb...@apache.org.
merge from 2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee9807e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee9807e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee9807e3
Branch: refs/heads/trunk
Commit: ee9807e3ac15bfa79483e53ac3c0160b36a1486b
Parents: 27a97a5 1992598
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 24 20:10:14 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 24 20:10:14 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/ee9807e3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 62ee818,664a23e..b14a5a6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,6 +1,39 @@@
-2.2.1
+3.0.0-beta2
+ * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061)
+ * Reuse TemporalRow when updating multiple MaterializedViews (CASSANDRA-10060)
+ * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
+ * Fix sstablerepairedset (CASSANDRA-10132)
+Merged from 2.2:
++ * (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)
* add CLEAR cqlsh command (CASSANDRA-10086)
* Support string literals as Role names for compatibility (CASSANDRA-10135)
+
+
+3.0.0-beta1
+ * Redesign secondary index API (CASSANDRA-9459, 7771, 9041)
+ * Fix throwing ReadFailure instead of ReadTimeout on range queries (CASSANDRA-10125)
+ * Rewrite hinted handoff (CASSANDRA-6230)
+ * Fix query on static compact tables (CASSANDRA-10093)
+ * Fix race during construction of commit log (CASSANDRA-10049)
+ * Add option to only purge repaired tombstones (CASSANDRA-6434)
+ * Change authorization handling for MVs (CASSANDRA-9927)
+ * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)
+ * Fix row deletion bug for Materialized Views (CASSANDRA-10014)
+ * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704)
+ * Fix multiple slices on RowSearchers (CASSANDRA-10002)
+ * Fix bug in merging of collections (CASSANDRA-10001)
+ * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
+ * Repair improvements when using vnodes (CASSANDRA-5220)
+ * Disable scripted UDFs by default (CASSANDRA-9889)
+ * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
+ * Use byte to serialize MT hash length (CASSANDRA-9792)
+ * Replace usage of Adler32 with CRC32 (CASSANDRA-8684)
+ * Fix migration to new format from 2.1 SSTable (CASSANDRA-10006)
+ * SequentialWriter should extend BufferedDataOutputStreamPlus (CASSANDRA-9500)
+ * Use the same repairedAt timestamp within incremental repair session (CASSANDRA-9111)
+Merged from 2.2:
* 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)
[02/10] cassandra git commit: (cqlsh) default load-from-file encoding
to utf-8 patch by Yasuharu Goto; reviewed by Carl Yeksigian for CASSANDRA-9898
Posted by jb...@apache.org.
(cqlsh) default load-from-file encoding to utf-8
patch by Yasuharu Goto; reviewed by Carl Yeksigian for CASSANDRA-9898
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5d0595b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5d0595b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5d0595b
Branch: refs/heads/cassandra-2.2
Commit: f5d0595b6e0fd3e3bae794c3d5f8016399f6c478
Parents: 447d605
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 24 20:08:51 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 24 20:08:51 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/f5d0595b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 45e59f7..2d11d55 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.9
+ * (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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5d0595b/pylib/cqlshlib/util.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/util.py b/pylib/cqlshlib/util.py
index 4273efc..dfa480d 100644
--- a/pylib/cqlshlib/util.py
+++ b/pylib/cqlshlib/util.py
@@ -118,6 +118,6 @@ def get_file_encoding_bomsize(filename):
file_encoding, size = encoding, len(bom)
break
else:
- file_encoding, size = "ascii", 0
+ file_encoding, size = "utf-8", 0
return (file_encoding, size)
[06/10] cassandra git commit: merge from 2.1
Posted by jb...@apache.org.
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-2.2
Commit: 1992598ecc28da78ebda070aace08c3fe9e6ea43
Parents: e667993 f5d0595
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 24 20:09:22 2015 -0500
Committer: Jonathan Ellis <jb...@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)
[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d110214
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d110214
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d110214
Branch: refs/heads/trunk
Commit: 5d110214649f3967e7c1e0ef41e98ca54c2a6541
Parents: 32c8415 ee9807e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 24 20:10:19 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 24 20:10:19 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/5d110214/CHANGES.txt
----------------------------------------------------------------------