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/5d0d6aa0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5d0d6aa0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5d0d6aa0 Branch: refs/heads/master Commit: 5d0d6aa05a0867c067dade996bc4f7ecd52f54b9 Parents: afbf5f1 be688fa Author: Josh Elser <els...@apache.org> Authored: Fri Mar 21 17:06:05 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Mar 21 17:06:05 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/cli/ClientOpts.java | 3 ++ .../core/client/impl/OfflineScanner.java | 3 ++ .../CachingHDFSSecretKeyEncryptionStrategy.java | 1 + .../NonCachingSecretKeyEncryptionStrategy.java | 9 ++-- .../apache/accumulo/core/volume/VolumeImpl.java | 2 - .../core/util/shell/ShellSetInstanceTest.java | 1 + .../impl/MiniAccumuloConfigImpl.java | 11 ++++- .../impl/MiniAccumuloConfigImplTest.java | 1 + .../apache/accumulo/proxy/SimpleProxyIT.java | 1 - .../org/apache/accumulo/server/Accumulo.java | 1 - .../apache/accumulo/server/init/Initialize.java | 46 +++++++++++--------- .../apache/accumulo/server/util/FileUtil.java | 4 ++ .../accumulo/server/init/InitializeTest.java | 5 +++ .../apache/accumulo/tserver/RootFilesTest.java | 1 + .../accumulo/test/BulkImportVolumeIT.java | 1 - 15 files changed, 59 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d0d6aa0/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d0d6aa0/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java ----------------------------------------------------------------------
