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/121cb5f1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/121cb5f1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/121cb5f1 Branch: refs/heads/master Commit: 121cb5f1dab2e0831aaaf10d130bb87ad4bb9f43 Parents: f025e9a 9fb7417 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Wed Apr 16 15:15:33 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Wed Apr 16 15:15:33 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/test/functional/BackupMasterIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
