cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Date Fri, 10 May 2013 22:52:27 GMT
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 <aleksey@apache.org>
Authored: Sat May 11 01:52:12 2013 +0300
Committer: Aleksey Yeschenko <aleksey@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
----------------------------------------------------------------------


Mime
View raw message