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/cf0bcb3f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cf0bcb3f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cf0bcb3f Branch: refs/heads/master Commit: cf0bcb3fbc2446fda1ec13b6e23499efc1a14992 Parents: 0f0a519 66075c3 Author: Josh Elser <els...@apache.org> Authored: Mon Apr 27 17:58:43 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Apr 27 17:58:43 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/master/Master.java | 7 +++++++ 1 file changed, 7 insertions(+) ----------------------------------------------------------------------
