Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1a91093 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1a91093 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1a91093 Branch: refs/heads/trunk Commit: e1a9109309511d80c4358406990bcd80b17ae7e1 Parents: 2315686 c2a36e7 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Sep 19 18:21:11 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Sep 19 18:21:11 2013 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/thrift/ThriftServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
