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/dfbb3c29
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dfbb3c29
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dfbb3c29

Branch: refs/heads/master
Commit: dfbb3c2990feed1e9b88e29537dd12d27426686c
Parents: 04e9139 a1d3c92
Author: Josh Elser <els...@apache.org>
Authored: Sat Oct 24 21:15:12 2015 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Sat Oct 24 21:15:12 2015 -0400

----------------------------------------------------------------------
 .../iterators/system/TimeSettingIterator.java   |  2 +-
 .../system/TimeSettingIteratorTest.java         | 31 ++++++++++++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


Reply via email to