Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d11cab0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3d11cab0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3d11cab0 Branch: refs/heads/master Commit: 3d11cab035c72c7dbd2354a7e5917f62eafc1252 Parents: 693d5be 9c11f72 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Oct 14 17:46:56 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Oct 14 17:46:56 2016 -0400 ---------------------------------------------------------------------- .../NonCachingSecretKeyEncryptionStrategy.java | 61 +++++++++++--------- 1 file changed, 33 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
