Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/20cc9f4e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/20cc9f4e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/20cc9f4e Branch: refs/heads/1.5.1-SNAPSHOT Commit: 20cc9f4ececea4c8fe5053deb42667e426e19084 Parents: 5510685 f56ae10 Author: Eric Newton <eric.new...@gmail.com> Authored: Mon Dec 30 13:16:05 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Mon Dec 30 13:16:05 2013 -0500 ---------------------------------------------------------------------- server/src/main/java/org/apache/accumulo/server/master/Master.java | 1 + 1 file changed, 1 insertion(+) ----------------------------------------------------------------------
