Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/63313820 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/63313820 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/63313820 Branch: refs/heads/master Commit: 633138205820f0b785e32307b6d538a8690aca5a Parents: 32b3730 44cd470 Author: Josh Elser <els...@apache.org> Authored: Thu May 28 21:14:28 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu May 28 21:14:28 2015 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/trace/Trace.java | 3 +- .../server/conf/ServerConfigurationFactory.java | 31 +++++++++++++------- .../master/tableOps/CreateImportDir.java | 4 +++ .../org/apache/accumulo/monitor/Monitor.java | 7 +++-- .../apache/accumulo/test/scalability/Run.java | 6 +++- .../apache/accumulo/trace/instrument/Trace.java | 3 +- 6 files changed, 37 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
