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/36745b5a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/36745b5a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/36745b5a Branch: refs/heads/master Commit: 36745b5a4a351e503ad27a7d1654fb76c2bd86e3 Parents: eb72c5b f3f5480 Author: Josh Elser <els...@apache.org> Authored: Tue Mar 25 17:34:52 2014 -0700 Committer: Josh Elser <els...@apache.org> Committed: Tue Mar 25 17:34:52 2014 -0700 ---------------------------------------------------------------------- .../core/file/rfile/bcfile/PrintInfo.java | 1 + .../CachingHDFSSecretKeyEncryptionStrategy.java | 3 +- .../NonCachingSecretKeyEncryptionStrategy.java | 2 + .../apache/accumulo/server/util/FileUtil.java | 25 +- .../accumulo/server/util/FileUtilTest.java | 235 +++++++++++++++++++ 5 files changed, 253 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
