You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2016/05/05 16:39:00 UTC
[4/4] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Merge branch 'cassandra-3.7' 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/b57b047e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b57b047e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b57b047e
Branch: refs/heads/trunk
Commit: b57b047e54fff01d904893ae68f0a607c7fda2e7
Parents: 1e92ce4 58d3b9a
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Thu May 5 11:37:17 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Thu May 5 11:37:17 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 6 ++++++
bin/cqlsh.py | 19 ++++++++++++++-----
pylib/cqlshlib/copyutil.py | 16 ++++++++++------
3 files changed, 30 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b57b047e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c2165db,882be7c..45d9fb1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,7 +1,12 @@@
+3.8
+ * Faster streaming (CASSANDRA-9766)
+
++
+ 3.7
+ Merged from 2.2:
+ * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
+
++
3.6
* Enhanced Compaction Logging (CASSANDRA-10805)
* Make prepared statement cache size configurable (CASSANDRA-11555)