Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5df9bc16 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5df9bc16 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5df9bc16 Branch: refs/heads/master Commit: 5df9bc16f5df2f0e050e1049821c49029ed6bc25 Parents: ad98547 d074eff Author: Keith Turner <ktur...@apache.org> Authored: Fri Jul 22 11:53:51 2016 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Fri Jul 22 11:53:51 2016 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/master/MasterTime.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------