cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Tue, 29 Sep 2015 09:54:24 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/trunk
Commit: c38235d7cf3dc9cf325e1db762ef589346c9f459
Parents: 5d918b8 4595ec0
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Sep 29 11:54:00 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Sep 29 11:54:00 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c38235d7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 851a19b,7e6f1e0..14651fe
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,14 +1,30 @@@
 -2.2.2
 +3.0.0-rc1
 + * Fix mixed version read request compatibility for compact static tables
 +   (CASSANDRA-10373)
 + * Fix paging of DISTINCT with static and IN (CASSANDRA-10354)
 + * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
 +   columns (CASSANDRA-9664)
 + * Move crc_check_chance out of compression options (CASSANDRA-9839)
 + * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301)
 + * Transfer hints to a different node on decommission (CASSANDRA-10198)
 + * Check partition keys for CAS operations during stmt validation (CASSANDRA-10338)
 + * Add custom query expressions to SELECT (CASSANDRA-10217)
 + * Fix minor bugs in MV handling (CASSANDRA-10362)
 + * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)
 + * Improve MV schema representation (CASSANDRA-9921)
 + * Add flag to enable/disable coordinator batchlog for MV writes (CASSANDRA-10230)
 + * Update cqlsh COPY for new internal driver serialization interface (CASSANDRA-10318)
 + * Give index implementations more control over rebuild operations (CASSANDRA-10312)
 + * Update index file format (CASSANDRA-10314)
 + * Add "shadowable" row tombstones to deal with mv timestamp issues (CASSANDRA-10261)
 + * CFS.loadNewSSTables() broken for pre-3.0 sstables
 + * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
 + * Small optimizations of sstable index serialization (CASSANDRA-10232)
 + * Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590)
 +Merged from 2.2:
+  * Configurable page size in cqlsh (CASSANDRA-9855)
   * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761)
 - * Cancel transaction for sstables we wont redistribute index summary
 -   for (CASSANDRA-10270)
 - * 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)
 + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
  Merged from 2.1:
   * Fix potential ClassCastException during paging (CASSANDRA-10352)
   * Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c38235d7/bin/cqlsh.py
----------------------------------------------------------------------


Mime
View raw message