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