Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/15a459b6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/15a459b6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/15a459b6 Branch: refs/heads/master Commit: 15a459b64cce79984b2ddff10add91caf7b0be9d Parents: fed4ae8 1df12a7 Author: Josh Elser <els...@apache.org> Authored: Wed Jan 21 14:28:28 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Wed Jan 21 14:28:28 2015 -0500 ---------------------------------------------------------------------- .../base/src/main/java/org/apache/accumulo/server/Accumulo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/15a459b6/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java ----------------------------------------------------------------------
