Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b0105661 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b0105661 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b0105661 Branch: refs/heads/master Commit: b01056616a3eb8fca64c6074f655cd8a4a94402d Parents: bb97fbf a234def Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Oct 10 14:39:05 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Oct 10 14:39:05 2014 -0400 ---------------------------------------------------------------------- test/src/test/java/org/apache/accumulo/test/ImportExportIT.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
