Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0fca7dca Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0fca7dca Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0fca7dca Branch: refs/heads/master Commit: 0fca7dca7e13a5526a4e8b3e8dbd6bf4e0d98f46 Parents: 99baad3 6138a80 Author: John Vines <vi...@apache.org> Authored: Tue Apr 22 12:32:12 2014 -0400 Committer: John Vines <vi...@apache.org> Committed: Tue Apr 22 12:32:12 2014 -0400 ---------------------------------------------------------------------- .../security/crypto/CryptoModuleFactory.java | 1 + .../accumulo/core/file/rfile/RFileTest.java | 21 ++++++++++++++++++++ 2 files changed, 22 insertions(+) ----------------------------------------------------------------------
