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:37:18 UTC
[3/3] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2
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/26995337
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26995337
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26995337
Branch: refs/heads/cassandra-1.2
Commit: 26995337b8d65f7af8eb12ef3a2c946fc4ad41c1
Parents: c3ff774 ce8bc33
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat May 11 01:37:00 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat May 11 01:37:00 2013 +0300
----------------------------------------------------------------------
test/system/test_thrift_server.py | 29 +++++
.../cassandra/service/CassandraServerTest.java | 91 ---------------
2 files changed, 29 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/26995337/test/system/test_thrift_server.py
----------------------------------------------------------------------