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/4cedbeb6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4cedbeb6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4cedbeb6 Branch: refs/heads/master Commit: 4cedbeb6073b18936a506be9bf51bf8475b075b8 Parents: 1e9a42c 9558b0d Author: Josh Elser <els...@apache.org> Authored: Mon Dec 15 13:32:55 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Dec 15 13:32:55 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/master/Master.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4cedbeb6/server/master/src/main/java/org/apache/accumulo/master/Master.java ----------------------------------------------------------------------
