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/47d27d53 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47d27d53 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47d27d53 Branch: refs/heads/cassandra-2.1 Commit: 47d27d5319c9a8edcd69fffb34d56b382e0f9c46 Parents: b3bb7fc b55f38b Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sun Aug 10 23:55:33 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sun Aug 10 23:55:33 2014 +0300 ---------------------------------------------------------------------- test/system/test_thrift_server.py | 40 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/47d27d53/test/system/test_thrift_server.py ----------------------------------------------------------------------
