You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by el...@apache.org on 2015/06/01 07:41:52 UTC

[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 <el...@apache.org>
Authored: Mon Jun 1 01:40:43 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Jun 1 01:40:43 2015 -0400

----------------------------------------------------------------------
 .../delegation/AuthenticationTokenSecretManager.java |  5 ++++-
 .../delegation/ZooAuthenticationKeyDistributor.java  | 15 ++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------