You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/08/11 03:11:43 UTC
[10/18] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b3bb7fcc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3bb7fcc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3bb7fcc
Branch: refs/heads/trunk
Commit: b3bb7fcc3c38dda424e1b041bcde2e43dbebc4eb
Parents: cd37d07 b2dcaf2
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Aug 8 21:20:21 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Aug 8 21:46:51 2014 +0300
----------------------------------------------------------------------
test/system/test_thrift_server.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3bb7fcc/test/system/test_thrift_server.py
----------------------------------------------------------------------
diff --cc test/system/test_thrift_server.py
index 7ecc8f1,7655958..f10496b
--- a/test/system/test_thrift_server.py
+++ b/test/system/test_thrift_server.py
@@@ -24,7 -24,7 +24,6 @@@ from . import thrift_client as clien
from thrift.Thrift import TApplicationException
from ttypes import *
--from constants import VERSION
def _i64(n):
@@@ -1318,8 -1236,8 +1317,6 @@@ class TestMutations(ThriftTester)
assert cf0.comparator_type == "org.apache.cassandra.db.marshal.BytesType"
def test_describe(self):
-- server_version = client.describe_version()
-- assert server_version == VERSION, (server_version, VERSION)
assert client.describe_cluster_name() == 'Test Cluster'
def test_describe_ring(self):