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 0415A18ECF for ; Mon, 1 Jun 2015 05:41:51 +0000 (UTC) Received: (qmail 63941 invoked by uid 500); 1 Jun 2015 05:41:50 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 63865 invoked by uid 500); 1 Jun 2015 05:41:50 -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 63848 invoked by uid 99); 1 Jun 2015 05:41:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2015 05:41:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 965BEDFFD7; Mon, 1 Jun 2015 05:41:50 +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: Mon, 01 Jun 2015 05:41:52 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fe97d511 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fe97d511 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fe97d511 Branch: refs/heads/master Commit: fe97d5111f3172a94dfd6e98749f550b22d66a18 Parents: e88f642 3289940 Author: Josh Elser Authored: Mon Jun 1 01:40:43 2015 -0400 Committer: Josh Elser Committed: Mon Jun 1 01:40:43 2015 -0400 ---------------------------------------------------------------------- .../delegation/AuthenticationTokenSecretManager.java | 5 ++++- .../delegation/ZooAuthenticationKeyDistributor.java | 15 ++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) ----------------------------------------------------------------------