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/a723216a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a723216a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a723216a Branch: refs/heads/master Commit: a723216a7fa649140eb643536ff57a9cf76db70d Parents: 041761c 0aa4758 Author: Josh Elser <els...@apache.org> Authored: Mon Apr 28 21:38:43 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Apr 28 21:38:43 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/test/functional/BackupMasterIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------