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 2013/09/19 17:23:00 UTC

[7/7] git commit: Merge remote-tracking branch 'origin/trunk' into trunk

Merge remote-tracking branch 'origin/trunk' into trunk


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

Branch: refs/heads/trunk
Commit: ec7a3e594e99c5ae85739737f8c07d2d5786e37a
Parents: 636598d e1a9109
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 10:22:40 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 10:22:40 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/thrift/ThriftServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------