Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e04ea77d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e04ea77d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e04ea77d Branch: refs/heads/1.7 Commit: e04ea77d770755f61c9318290bb041923334a791 Parents: c5aa060 b754d12 Author: Josh Elser <els...@apache.org> Authored: Thu Jun 4 00:13:05 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Jun 4 00:13:05 2015 -0400 ---------------------------------------------------------------------- .../apache/accumulo/test/functional/ScanIdIT.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e04ea77d/test/src/test/java/org/apache/accumulo/test/functional/ScanIdIT.java ----------------------------------------------------------------------