Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9386be87 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9386be87 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9386be87 Branch: refs/heads/master Commit: 9386be870924beda0e4062afa61c533288fa4194 Parents: 0a0be0f e84fad8 Author: Josh Elser <els...@apache.org> Authored: Tue Feb 11 15:03:17 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Tue Feb 11 15:03:17 2014 -0500 ---------------------------------------------------------------------- .../master/src/main/java/org/apache/accumulo/master/Master.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9386be87/server/master/src/main/java/org/apache/accumulo/master/Master.java ----------------------------------------------------------------------
