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/11/26 00:53:28 UTC
[1/3] cassandra git commit: CASSANDRA-9304 follow-up: fix cqlshlib
tests
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 9b3b3ca00 -> 5fd6c545e
CASSANDRA-9304 follow-up: fix cqlshlib tests
Patch by Stefania Alborghetti; reviewed by Tyler Hobbs as a
follow-up to CASSANDRA-9304
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9768e57e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9768e57e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9768e57e
Branch: refs/heads/cassandra-3.0
Commit: 9768e57e3e855c8049614342053199940a6c65f6
Parents: 68ea4ed
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Mon Nov 23 08:55:37 2015 +0800
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Nov 25 17:50:34 2015 -0600
----------------------------------------------------------------------
pylib/cqlshlib/formatting.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9768e57e/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index 54dde0f..b740bf9 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -19,9 +19,9 @@ import sys
import re
import calendar
import math
+import wcwidth
from collections import defaultdict
-from . import wcwidth
-from .displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP
+from displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP
from cassandra.cqltypes import EMPTY
from cassandra.util import datetime_from_timestamp
from util import UTC
[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd75ecd9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd75ecd9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd75ecd9
Branch: refs/heads/cassandra-3.0
Commit: cd75ecd90fe7c49c09dde8e4545555edd235b1a2
Parents: a90c3b2 9768e57
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Wed Nov 25 17:52:58 2015 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Nov 25 17:52:58 2015 -0600
----------------------------------------------------------------------
pylib/cqlshlib/formatting.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd75ecd9/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/formatting.py
index 8b66bce,b740bf9..62ecd10
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@@ -15,15 -15,13 +15,15 @@@
# limitations under the License.
import binascii
-import sys
-import re
import calendar
import math
+import re
+import sys
+import platform
- from collections import defaultdict
+ import wcwidth
+
- from . import wcwidth
- from .displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP
+ from collections import defaultdict
+ from displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP
from cassandra.cqltypes import EMPTY
from cassandra.util import datetime_from_timestamp
from util import UTC
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ty...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fd6c545
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fd6c545
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fd6c545
Branch: refs/heads/cassandra-3.0
Commit: 5fd6c545e5e95b2e2a90b06d95177c57efb6f05b
Parents: 9b3b3ca cd75ecd
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Wed Nov 25 17:53:15 2015 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Nov 25 17:53:15 2015 -0600
----------------------------------------------------------------------
pylib/cqlshlib/formatting.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------