cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [4/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Wed, 14 Oct 2015 15:40:36 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 174cea009175361e6d9c6799073fb580abc13511
Parents: cc2478d 50da872
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Oct 14 16:39:24 2015 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Oct 14 16:39:24 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/174cea00/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6b7b4eb,4da4aab..87d34ab
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -13,41 -9,27 +13,42 @@@ Merged from 2.2
   * Avoid NoClassDefFoundError during DataDescriptor initialization on windows (CASSANDRA-10412)
   * Preserve case of quoted Role & User names (CASSANDRA-10394)
   * cqlsh pg-style-strings broken (CASSANDRA-10484)
 - * Make Hadoop CF splits more polite to custom orderered partitioners (CASSANDRA-10400)
 - * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
 + * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
  Merged from 2.1:
 - * Fix mmap file segment seeking to EOF (CASSANDRA-10478)
++ * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
 + * Don't allow startup if the node's rack has changed (CASSANDRA-10242)
 + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
   * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275)
   * Mark nodes as dead even if they've already left (CASSANDRA-10205)
 - * Update internal python driver used by cqlsh (CASSANDRA-10161, CASSANDRA-10507)
  
  
 -2.2.2
 - * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
 +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:
   * Bulk Loader API could not tolerate even node failure (CASSANDRA-10347)
   * Avoid misleading pushed notifications when multiple nodes

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


Mime
View raw message