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 2015/04/03 22:18:30 UTC
[1/2] cassandra git commit: cqlsh: fix formatting of map keys and
values
Repository: cassandra
Updated Branches:
refs/heads/trunk 2341e945b -> adcb8a439
cqlsh: fix formatting of map keys and values
Patch by Tyler Hobbs; reviewed by Philip Thompson for CASSANDRA-9114
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f7162293
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7162293
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7162293
Branch: refs/heads/trunk
Commit: f7162293d2d61319be25aad49e76546ab335b9ff
Parents: e4072cf
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Apr 3 15:17:20 2015 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Apr 3 15:17:20 2015 -0500
----------------------------------------------------------------------
pylib/cqlshlib/formatting.py | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7162293/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index ac12fe6..868ec28 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -264,6 +264,7 @@ def format_value_map(val, encoding, colormap, date_time_format, float_precision,
return FormattedValue(bval, coloredval, displaywidth)
formatter_for('OrderedDict')(format_value_map)
formatter_for('OrderedMap')(format_value_map)
+formatter_for('OrderedMapSerializedKey')(format_value_map)
def format_value_utype(val, encoding, colormap, date_time_format, float_precision, nullval, **_):
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/adcb8a43
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adcb8a43
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/adcb8a43
Branch: refs/heads/trunk
Commit: adcb8a439a4826db6d5db1672c882525b60c66cc
Parents: 2341e94 f716229
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Apr 3 15:18:17 2015 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Apr 3 15:18:17 2015 -0500
----------------------------------------------------------------------
pylib/cqlshlib/formatting.py | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------