natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.2' into cassandra-3.0 

Conflicts:
	CHANGES.txt
This commit is contained in:
Tyler Hobbs 2015-09-09 17:17:52 -05:00
parent cc0038b7d1 b2b756013a
commit 55fb5cdf1c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -5,6 +5,7 @@
Merged from 2.2:
* Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
Merged from 2.1:
* (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282)
* Scrub, Cleanup and Upgrade do not unmark compacting until all operations
have completed, regardless of the occurence of exceptions (CASSANDRA-10274)

6
bin/cqlsh.py
View File

@ -2556,7 +2556,7 @@ def read_options(cmdlineargs, environment):
try:
options.connect_timeout = int(options.connect_timeout)
except ValueError:
parser.error('{} is not a valid timeout.'.format(options.connect_timeout))
parser.error('"%s" is not a valid timeout.' % (options.connect_timeout,))
options.connect_timeout = DEFAULT_CONNECT_TIMEOUT_SECONDS
options.client_timeout = option_with_default(configs.get, 'connection', 'client_timeout', '10')
@ -2651,8 +2651,8 @@ def main(options, hostname, port):
sys.exit("Can't open %r: %s" % (options.file, e))
if options.debug:
sys.stderr.write("Using CQL driver: {}\n".format(cassandra))
sys.stderr.write("Using connect timeout: {} seconds\n".format(options.connect_timeout))
sys.stderr.write("Using CQL driver: %s\n" % (cassandra,))
sys.stderr.write("Using connect timeout: %s seconds\n" % (options.connect_timeout,))
try:
shell = Shell(hostname,