Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CE5F817F0C for ; Mon, 10 Nov 2014 19:59:27 +0000 (UTC) Received: (qmail 53016 invoked by uid 500); 10 Nov 2014 19:59:27 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 52919 invoked by uid 500); 10 Nov 2014 19:59:27 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 52835 invoked by uid 99); 10 Nov 2014 19:59:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Nov 2014 19:59:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3DF9C9A4493; Mon, 10 Nov 2014 19:59:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Mon, 10 Nov 2014 19:59:27 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] accumulo git commit: ACCUMULO-3318 Remove extraneous javadoc tag without description 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 Authored: Mon Nov 10 14:56:19 2014 -0500 Committer: Christopher Tubbs 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) {