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 2013/05/11 00:52:27 UTC
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Conflicts:
test/unit/org/apache/cassandra/service/CassandraServerTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/72231959
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72231959
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72231959
Branch: refs/heads/trunk
Commit: 72231959a622f51ee2030a9da5a56aa027328970
Parents: 738b127 2699533
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat May 11 01:52:12 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat May 11 01:52:12 2013 +0300
----------------------------------------------------------------------
test/system/test_thrift_server.py | 29 +++++
.../cassandra/service/CassandraServerTest.java | 88 ---------------
2 files changed, 29 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/72231959/test/system/test_thrift_server.py
----------------------------------------------------------------------