You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/02/22 11:32:33 UTC
[1/3] git commit: Extra change for #3933 for 1.1
Updated Branches:
refs/heads/cassandra-1.1 9f90a7997 -> 40bb5509b
Extra change for #3933 for 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40bb5509
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40bb5509
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40bb5509
Branch: refs/heads/cassandra-1.1
Commit: 40bb5509b9f25c20c29017ea2b282fa46982fe09
Parents: d9124ed
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 22 11:32:17 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 22 11:32:17 2012 +0100
----------------------------------------------------------------------
bin/cqlsh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40bb5509/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index ecad450..84aebea 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -974,7 +974,7 @@ class Shell(cmd.Cmd):
optval = cql_escape(optval)
notable_columns.append((option, optval))
for option, thriftname, _ in cqlhandling.columnfamily_map_options:
- optmap = getattr(cfdef, thriftname or option)
+ optmap = getattr(cfdef, thriftname or option, {})
for k, v in optmap.items():
notable_columns.append(('%s:%s' % (option, k), cql_escape(v)))
out.write('\n)')