Merge remote-tracking branch 'origin/master' into ACCUMULO-378
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4ac04b95 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4ac04b95 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4ac04b95 Branch: refs/heads/ACCUMULO-378 Commit: 4ac04b95d7f1919a35af2d9e60d80a2c9b94074c Parents: 178ffe9 f131ac6 Author: Josh Elser <els...@apache.org> Authored: Wed May 21 00:28:59 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed May 21 00:28:59 2014 -0400 ---------------------------------------------------------------------- .../iterators/user/RowEncodingIterator.java | 174 +++++++++++++++++++ .../core/iterators/user/WholeRowIterator.java | 140 +++------------ 2 files changed, 199 insertions(+), 115 deletions(-) ----------------------------------------------------------------------