Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/66075c3e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/66075c3e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/66075c3e Branch: refs/heads/1.7 Commit: 66075c3eaf67cfe5cc8cd5e1c16ec595b98ae3c5 Parents: 4fa8a8f bc87145 Author: Josh Elser <els...@apache.org> Authored: Mon Apr 27 17:58:34 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Apr 27 17:58:34 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/master/Master.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/66075c3e/server/master/src/main/java/org/apache/accumulo/master/Master.java ----------------------------------------------------------------------