Repository: accumulo Updated Branches: refs/heads/1.6 1f3288b20 -> 844d9edc9 refs/heads/master 6236c4d47 -> bedbca567
ACCUMULO-3318 Remove extraneous javadoc tag without description Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/844d9edc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/844d9edc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/844d9edc Branch: refs/heads/1.6 Commit: 844d9edc99e6672dbcfbde2b421d267fd8599687 Parents: 1f3288b Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Nov 10 14:56:19 2014 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Nov 10 14:56:19 2014 -0500 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/844d9edc/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java b/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java index 69cc242..29f7fb7 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java @@ -425,7 +425,6 @@ public class ThriftUtil { * * @param socket * The Socket - * @return */ private Socket overrideProtocol(final Socket socket) { if (socket instanceof SSLSocket) {
