Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9c11f72e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9c11f72e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9c11f72e Branch: refs/heads/1.8 Commit: 9c11f72e3a00b9e0fb888c37d46fb33935eb9304 Parents: 9803093 9e236f2 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Oct 14 17:44:18 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Oct 14 17:44:18 2016 -0400 ---------------------------------------------------------------------- .../NonCachingSecretKeyEncryptionStrategy.java | 61 +++++++++++--------- 1 file changed, 33 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
