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/daee5852 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/daee5852 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/daee5852 Branch: refs/heads/master Commit: daee58523270b342a0639ef1cd0a8a856e0d52b2 Parents: 0c97066 fbbe472 Author: John Vines <vi...@apache.org> Authored: Tue Apr 22 17:22:34 2014 -0400 Committer: John Vines <vi...@apache.org> Committed: Tue Apr 22 17:22:34 2014 -0400 ---------------------------------------------------------------------- .../accumulo/core/file/rfile/RFileTest.java | 10 +++++--- .../core/security/crypto/CryptoTest.java | 26 ++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
