Updated Branches: refs/heads/trunk ec7a3e594 -> e5a7cede6
Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cef6552c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cef6552c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cef6552c Branch: refs/heads/trunk Commit: cef6552c26d79baff1ecfcc4a9f556681c0cb15f Parents: fb7b71f c2a36e7 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Sep 19 10:22:30 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Sep 19 10:22:30 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/thrift/ThriftServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
