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 D61DBE450 for ; Mon, 4 Feb 2013 23:58:41 +0000 (UTC) Received: (qmail 44244 invoked by uid 500); 4 Feb 2013 23:58:41 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 44210 invoked by uid 500); 4 Feb 2013 23:58:41 -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 44198 invoked by uid 99); 4 Feb 2013 23:58:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Feb 2013 23:58:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Feb 2013 23:58:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F0745238897F; Mon, 4 Feb 2013 23:58:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1442437 - /accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java Date: Mon, 04 Feb 2013 23:58:19 -0000 To: commits@accumulo.apache.org From: vines@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130204235819.F0745238897F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vines Date: Mon Feb 4 23:58:19 2013 New Revision: 1442437 URL: http://svn.apache.org/viewvc?rev=1442437&view=rev Log: ACCUMULO-259 - had unmerged stuff in the javadocs Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java?rev=1442437&r1=1442436&r2=1442437&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java Mon Feb 4 23:58:19 2013 @@ -56,14 +56,11 @@ public class ConnectorImpl extends Conne * * Use {@link Instance#getConnector(String, byte[])} * -<<<<<<< .working -======= * @param instance * @param user * @param password * @throws AccumuloException * @throws AccumuloSecurityException ->>>>>>> .merge-right.r1438353 * @see Instance#getConnector(String user, byte[] password) * @deprecated Not for client use */