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 2016/05/27 20:49:11 UTC
[1/3] cassandra git commit: cqlsh: Suppress stacktraces for
Read/WriteFailures
Repository: cassandra
Updated Branches:
refs/heads/trunk 5ca8052a9 -> 692d9992d
cqlsh: Suppress stacktraces for Read/WriteFailures
Patch by Zhongxiang Zheng; reviewed by Tyler Hobbs for CASSANDRA-11032
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a7704e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a7704e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a7704e5
Branch: refs/heads/trunk
Commit: 7a7704e5fddb00c877329db93d352e03e2179703
Parents: 6f236c8
Author: Zhongxiang Zheng <zz...@yahoo-corp.jp>
Authored: Fri May 27 13:04:47 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri May 27 15:47:36 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a7704e5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 103eff0..d96f3c6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.7
+ * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
* Remove unneeded code to repair index summaries that have
been improperly down-sampled (CASSANDRA-11127)
* Avoid WriteTimeoutExceptions during commit log replay due to materialized
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a7704e5/bin/cqlsh.py
----------------------------------------------------------------------
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 0c60a52..9dc7b77 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -152,7 +152,6 @@ from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata,
TableMetadata, protect_name, protect_names)
from cassandra.policies import WhiteListRoundRobinPolicy
from cassandra.query import SimpleStatement, ordered_dict_factory, TraceUnavailable
-from cassandra.type_codes import DateType
from cassandra.util import datetime_from_timestamp
# cqlsh should run correctly when run out of a Cassandra source tree,
@@ -263,8 +262,8 @@ if os.path.exists(OLD_HISTORY):
# END history/config definition
CQL_ERRORS = (
- cassandra.AlreadyExists, cassandra.AuthenticationFailed, cassandra.InvalidRequest,
- cassandra.Timeout, cassandra.Unauthorized, cassandra.OperationTimedOut,
+ cassandra.AlreadyExists, cassandra.AuthenticationFailed, cassandra.CoordinationFailure,
+ cassandra.InvalidRequest, cassandra.Timeout, cassandra.Unauthorized, cassandra.OperationTimedOut,
cassandra.cluster.NoHostAvailable,
cassandra.connection.ConnectionBusy, cassandra.connection.ProtocolError, cassandra.connection.ConnectionException,
cassandra.protocol.ErrorMessage, cassandra.protocol.InternalError, cassandra.query.TraceUnavailable
[3/3] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/692d9992
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/692d9992
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/692d9992
Branch: refs/heads/trunk
Commit: 692d9992db6cb78fbbf285070faec00d7ffbe8e3
Parents: 5ca8052 22e0a1d
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri May 27 15:48:30 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri May 27 15:48:30 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/692d9992/CHANGES.txt
----------------------------------------------------------------------
[2/3] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.7
Posted by ty...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/22e0a1da
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22e0a1da
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22e0a1da
Branch: refs/heads/trunk
Commit: 22e0a1daa6b4487a4ee8f6636e7ed1c51648bec2
Parents: a2dd005 7a7704e
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri May 27 15:48:22 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri May 27 15:48:22 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/22e0a1da/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0c447f5,d96f3c6..8a854ac
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
-3.0.7
+3.7
+ * Don't use static dataDirectories field in Directories instances (CASSANDRA-11647)
+Merged from 3.0:
+ * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
* Remove unneeded code to repair index summaries that have
been improperly down-sampled (CASSANDRA-11127)
* Avoid WriteTimeoutExceptions during commit log replay due to materialized
http://git-wip-us.apache.org/repos/asf/cassandra/blob/22e0a1da/bin/cqlsh.py
----------------------------------------------------------------------