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/01/22 01:37:37 UTC
[1/2] cassandra git commit: Update cqlsh formatting for upgraded
python driver
Repository: cassandra
Updated Branches:
refs/heads/trunk 0c3720ab8 -> 5d3c2c985
Update cqlsh formatting for upgraded python driver
Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-8664
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8092d2c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8092d2c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8092d2c6
Branch: refs/heads/trunk
Commit: 8092d2c654bac86265738f4ad8c06440ad2ce4b6
Parents: 7dc94ab
Author: Adam Holmberg <Ad...@datastax.com>
Authored: Wed Jan 21 18:36:29 2015 -0600
Committer: Tyler Hobbs <ty...@apache.org>
Committed: Wed Jan 21 18:36:29 2015 -0600
----------------------------------------------------------------------
pylib/cqlshlib/formatting.py | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8092d2c6/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index 845ffac..f03540d 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -246,6 +246,7 @@ def format_value_map(val, encoding, colormap, time_format, float_precision, null
displaywidth = 4 * len(subs) + sum(k.displaywidth + v.displaywidth for (k, v) in subs)
return FormattedValue(bval, coloredval, displaywidth)
formatter_for('OrderedDict')(format_value_map)
+formatter_for('OrderedMap')(format_value_map)
def format_value_utype(val, encoding, colormap, 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/5d3c2c98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d3c2c98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d3c2c98
Branch: refs/heads/trunk
Commit: 5d3c2c985287ad2f2f899a84ccdcb2d3ce963854
Parents: 0c3720a 8092d2c
Author: Tyler Hobbs <ty...@apache.org>
Authored: Wed Jan 21 18:37:21 2015 -0600
Committer: Tyler Hobbs <ty...@apache.org>
Committed: Wed Jan 21 18:37:21 2015 -0600
----------------------------------------------------------------------
pylib/cqlshlib/formatting.py | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------