cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stefa...@apache.org
Subject [08/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Thu, 21 Apr 2016 02:20:55 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/bb68078e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb68078e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb68078e

Branch: refs/heads/cassandra-3.0
Commit: bb68078e7c6cfb51c931604f9fc137921db18347
Parents: c568efe b80ff54
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Thu Apr 21 10:17:50 2016 +0800
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Committed: Thu Apr 21 10:17:50 2016 +0800

----------------------------------------------------------------------
 CHANGES.txt                | 3 ++-
 pylib/cqlshlib/copyutil.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb68078e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6fffe2a,e51e6d2..eb2405c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -16,25 -13,6 +16,26 @@@ Merged from 2.2
   * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532)
   * Make deprecated repair methods backward-compatible with previous notification service
(CASSANDRA-11430)
   * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
- 
++Merged from 2.1:
++ * cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549)
 +
 +3.0.5
 + * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943)
 + * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320)
 + * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131)
 + * Upgrade ohc to 0.4.3
 + * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093)
 + * Allocate merkletrees with the correct size (CASSANDRA-11390)
 + * Support streaming pre-3.0 sstables (CASSANDRA-10990)
 + * Add backpressure to compressed commit log (CASSANDRA-10971)
 + * SSTableExport supports secondary index tables (CASSANDRA-11330)
 + * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
 + * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
 + * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
 + * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
 + * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
 + * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
 +Merged from 2.2:
   * DatabaseDescriptor should log stacktrace in case of Eception during seed provider creation
(CASSANDRA-11312)
   * Use canonical path for directory in SSTable descriptor (CASSANDRA-10587)
   * Add cassandra-stress keystore option (CASSANDRA-9325)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb68078e/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------


Mime
View raw message