Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f86e000 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4f86e000 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4f86e000 Branch: refs/heads/master Commit: 4f86e0001f5241514b24595f42365314b4d330fd Parents: db42aba b930321 Author: Mike Drob <md...@cloudera.com> Authored: Fri Feb 7 18:36:02 2014 -0500 Committer: Mike Drob <md...@cloudera.com> Committed: Fri Feb 7 18:36:02 2014 -0500 ---------------------------------------------------------------------- .../core/iterators/user/WholeRowIterator.java | 55 +++++++++----------- .../iterators/user/WholeRowIteratorTest.java | 24 +++++++-- 2 files changed, 44 insertions(+), 35 deletions(-) ----------------------------------------------------------------------