Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/535e2f35 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/535e2f35 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/535e2f35 Branch: refs/heads/master Commit: 535e2f357bfb80af5188bb6120cee66fd610b1b3 Parents: 650f1f9 f6ba154 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed May 27 16:28:54 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed May 27 16:28:54 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
