Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/300f7941 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/300f7941 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/300f7941 Branch: refs/heads/master Commit: 300f7941c401c7dbd50492ff2e1a30c073dcca89 Parents: eed3007 e7dc536 Author: Josh Elser <els...@apache.org> Authored: Fri Oct 10 12:33:03 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Oct 10 12:33:03 2014 -0400 ---------------------------------------------------------------------- .../core/security/crypto/DefaultCryptoModule.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/300f7941/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java ----------------------------------------------------------------------
