This is an automated email from the ASF dual-hosted git repository.
stefania pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 57b0bb93ab4811529918300c41fbb08433f4f707
Merge: 912c6c4 fe263ad
Author: Stefania Alborghetti <stefania.alborghe...@datastax.com>
AuthorDate: Thu Apr 9 09:00:58 2020 -0400
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 2 ++
pylib/cqlshlib/copyutil.py | 4 ++--
pylib/cqlshlib/formatting.py | 9 ++++++++-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --cc CHANGES.txt
index 9342825,eb0b66e..ce4775b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -7,6 -3,8 +7,8 @@@ Merged from 3.0
* Run evictFromMembership in GossipStage (CASSANDRA-15592)
Merged from 2.2:
* Disable JMX rebinding (CASSANDRA-15653)
+ Merged from 2.1:
- * Fix parse error in cqlsh COPY FROM and formatting for map of blobs
(CASSANDRA-15679)
++ * Fix parse error in cqlsh COPY FROM and formatting for map of blobs
(CASSANDRA-15679)
* Fix Commit log replays when static column clustering keys are collections
(CASSANDRA-14365)
* Fix Red Hat init script on newer systemd versions (CASSANDRA-15273)
* Allow EXTRA_CLASSPATH to work on tar/source installations (CASSANDRA-15567)
diff --cc pylib/cqlshlib/copyutil.py
index 7f97b49,6a45153..b91bb76
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@ -53,7 -53,7 +53,7 @@@ from cassandra.util import Date, Tim
from cql3handling import CqlRuleSet
from displaying import NO_COLOR_MAP
- from formatting import format_value_default, CqlType, DateTimeFormat, EMPTY,
get_formatter
-from formatting import format_value_default, DateTimeFormat, EMPTY,
get_formatter, BlobType
++from formatting import format_value_default, CqlType, DateTimeFormat, EMPTY,
get_formatter, BlobType
from sslhandling import ssl_settings
PROFILE_ON = False
diff --cc pylib/cqlshlib/formatting.py
index 803ea63,53ba478..9927aa1
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@@ -243,8 -160,8 +249,9 @@@ def format_value_blob(val, colormap, **
return colorme(bval, colormap, 'blob')
+ formatter_for('bytearray')(format_value_blob)
formatter_for('buffer')(format_value_blob)
+formatter_for('blob')(format_value_blob)
def format_python_formatted_type(val, colormap, color, quote=False):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
