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/06/02 01:32:25 UTC

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk

Conflicts:
	test/system/test_thrift_server.py


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37f0c8c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37f0c8c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37f0c8c9

Branch: refs/heads/trunk
Commit: 37f0c8c91f1ea6ad2d3dc18f3040f39c7137217c
Parents: 3d1cfd1 452b1be
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sun Jun 2 02:32:10 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sun Jun 2 02:32:10 2013 +0300

----------------------------------------------------------------------
 test/system/test_thrift_server.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/37f0c8c9/test/system/test_thrift_server.py
----------------------------------------------------------------------