cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [5/7] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Wed, 24 Feb 2016 13:47:09 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/d7e0c301
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7e0c301
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7e0c301

Branch: refs/heads/cassandra-3.0
Commit: d7e0c301863858b913f234b158aae383ed8c4ae1
Parents: c4bd6d2 66b0d3f
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Wed Feb 24 05:43:31 2016 -0800
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Wed Feb 24 05:44:41 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt         |  1 +
 bin/cqlsh.py        | 12 ++++--------
 conf/cqlshrc.sample |  3 ++-
 3 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7e0c301/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9ca2f80,9162165..4549ded
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -33,6 -16,6 +33,7 @@@ Merged from 2.2
   * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
   * Fix paging on DISTINCT queries repeats result when first row in partition changes
     (CASSANDRA-10010)
++ * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124)
  Merged from 2.1:
   * Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
   * Only notify if repair status changed (CASSANDRA-11172)

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


Mime
View raw message