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 9DA2E1038F for ; Thu, 19 Dec 2013 02:55:01 +0000 (UTC) Received: (qmail 44561 invoked by uid 500); 19 Dec 2013 02:55:01 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 44455 invoked by uid 500); 19 Dec 2013 02:55:01 -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 44398 invoked by uid 99); 19 Dec 2013 02:55:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Dec 2013 02:55:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 451D7E298; Thu, 19 Dec 2013 02:55:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Thu, 19 Dec 2013 02:55:03 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java 1.6 should already interpolate correctly due to changes in Property and AccumuloConfiguration. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/81481342 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81481342 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81481342 Branch: refs/heads/master Commit: 814813421af9fee2c5f361588224d336919cd7b0 Parents: f228caf 001fdd6 Author: Josh Elser Authored: Wed Dec 18 17:02:07 2013 -0500 Committer: Josh Elser Committed: Wed Dec 18 17:02:07 2013 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/core/security/SecurityUtil.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/81481342/core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java index 4ffcc36,672e784..59c1974 --- a/core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java @@@ -29,7 -29,9 +29,8 @@@ import org.apache.log4j.Logger */ public class SecurityUtil { private static final Logger log = Logger.getLogger(SecurityUtil.class); - private static final String ACCUMULO_HOME = "ACCUMULO_HOME", ACCUMULO_CONF_DIR = "ACCUMULO_CONF_DIR"; public static boolean usingKerberos = false; + /** * This method is for logging a server in kerberos. If this is used in client code, it will fail unless run as the accumulo keytab's owner. Instead, use * {@link #login(String, String)}