cassandra-commits mailing list archives

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


Mime
View raw message