cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Thu, 23 Jun 2016 15:36:35 GMT
Merge branch 'cassandra-3.0' into trunk

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/ff8d078c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff8d078c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff8d078c

Branch: refs/heads/trunk
Commit: ff8d078c5b9ce8a04a6d7b77d379bd871e54d5b8
Parents: fc7785b edaa693
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Thu Jun 23 10:36:03 2016 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Thu Jun 23 10:36:03 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff8d078c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f5843ec,488fde3..eec4d66
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
 -3.0.8
 +3.8
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 + * Add Change-Data-Capture (CASSANDRA-8844)
 +Merged from 3.0:
+  * cqlsh: fix error handling in rare COPY FROM failure scenario (CASSANDRA-12070)
   * Disable autocompaction during drain (CASSANDRA-11878)
   * Add a metrics timer to MemtablePool and use it to track time spent blocked on memory
in MemtableAllocator (CASSANDRA-11327)
   * Fix upgrading schema with super columns with non-text subcomparators (CASSANDRA-12023)

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


Mime
View raw message