Updated Branches: refs/heads/cassandra-1.1 c7399e97e -> 988c10fd3 refs/heads/trunk a3e31e50b -> ae77ecbaa
Merge branch 'cassandra-1.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/ae77ecba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae77ecba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae77ecba Branch: refs/heads/trunk Commit: ae77ecbaacc2f35618fbc38f0cd8a5d4974d12ab Parents: a3e31e5 988c10f Author: Brandon Williams <[email protected]> Authored: Fri Nov 2 15:26:12 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Nov 2 15:26:12 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae77ecba/bin/cqlsh ---------------------------------------------------------------------- diff --cc bin/cqlsh index e8994d8,5728240..27eef7b --- a/bin/cqlsh +++ b/bin/cqlsh @@@ -116,11 -111,10 +116,11 @@@ CONFIG_FILE = os.path.expanduser(os.pat HISTORY = os.path.expanduser(os.path.join('~', '.cqlsh_history')) DEFAULT_HOST = 'localhost' DEFAULT_PORT = 9160 -DEFAULT_CQLVER = '2' +DEFAULT_CQLVER = '3' +DEFAULT_TRANSPORT_FACTORY = 'cqlshlib.tfactory.regular_transport_factory' DEFAULT_TIME_FORMAT = '%Y-%m-%d %H:%M:%S%z' - DEFAULT_FLOAT_PRECISION = 3 + DEFAULT_FLOAT_PRECISION = 5 if readline is not None and 'libedit' in readline.__doc__: DEFAULT_COMPLETEKEY = '\t'
