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/e25146d0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e25146d0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e25146d0 Branch: refs/heads/master Commit: e25146d0d65ba112ce7008a9f01ec9f850cebd6c Parents: a03f14a fae7a82 Author: Josh Elser <els...@apache.org> Authored: Fri May 1 01:14:41 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri May 1 01:14:41 2015 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/conf/config-header.txt | 9 +++++++++ docs/src/main/asciidoc/chapters/administration.txt | 7 +++++++ .../main/java/org/apache/accumulo/tserver/TabletServer.java | 4 ++++ .../org/apache/accumulo/tserver/log/TabletServerLogger.java | 8 ++++++++ 4 files changed, 28 insertions(+) ----------------------------------------------------------------------
