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/bd515fce Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bd515fce Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bd515fce Branch: refs/heads/master Commit: bd515fceb461854c78521beb9dad7121bbe75c08 Parents: 081eb1f a4a1d6e Author: Josh Elser <els...@apache.org> Authored: Wed Jan 13 15:11:10 2016 -0500 Committer: Josh Elser <els...@apache.org> Committed: Wed Jan 13 15:11:10 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/tserver/session/ScanSession.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/bd515fce/server/tserver/src/main/java/org/apache/accumulo/tserver/session/ScanSession.java ----------------------------------------------------------------------
