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:36 UTC

[08/10] cassandra git commit: merge from 2.2

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)