Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3107627b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3107627b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3107627b Branch: refs/heads/master Commit: 3107627b778e3093d95777a4313277305cd0aaa2 Parents: bb24ea7 8bcf346 Author: Josh Elser <els...@apache.org> Authored: Fri Jul 18 15:44:15 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Jul 18 15:44:15 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/conf/Property.java | 4 + .../accumulo/core/iterators/IteratorUtil.java | 64 ++-- .../accumulo/core/iterators/IterUtilTest.java | 279 ----------------- .../core/iterators/IteratorUtilTest.java | 306 +++++++++++++++++++ 4 files changed, 345 insertions(+), 308 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3107627b/core/src/main/java/org/apache/accumulo/core/conf/Property.java ----------------------------------------------------------------------
