You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/03/19 18:12:20 UTC

[03/16] git commit: Merge branch 'cassandra-2.1' into trunk

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: f0227a6c1ca8dab34c1b8cfe095ce8e0a2dde28e
Parents: 96b55ce 9ef3eee
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Mar 19 11:46:27 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Mar 19 11:46:27 2014 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/thrift/TServerFactory.java | 1 -
 src/java/org/apache/cassandra/thrift/ThriftServer.java   | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------