Merge branch '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/209cc076 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/209cc076 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/209cc076 Branch: refs/heads/master Commit: 209cc076b46a5e7580ff3741697e32d35546e70c Parents: b71bc4d feb0f31 Author: Christopher Tubbs <[email protected]> Authored: Wed Nov 13 20:18:30 2013 -0500 Committer: Christopher Tubbs <[email protected]> Committed: Wed Nov 13 20:18:30 2013 -0500 ---------------------------------------------------------------------- .../apache/accumulo/core/cli/ClientOpts.java | 16 ++-- .../core/client/mock/MockConfiguration.java | 11 ++- .../core/conf/AccumuloConfiguration.java | 43 +++++++++-- .../accumulo/core/conf/ConfigurationCopy.java | 9 ++- .../core/conf/DefaultConfiguration.java | 26 +++++-- .../accumulo/core/conf/SiteConfiguration.java | 21 ++--- .../accumulo/core/iterators/IteratorUtil.java | 80 ++++++++++---------- .../examples/simple/mapreduce/JobUtil.java | 4 +- .../server/conf/TableConfiguration.java | 35 ++++----- .../accumulo/server/conf/ZooConfiguration.java | 30 ++------ 10 files changed, 147 insertions(+), 128 deletions(-) ----------------------------------------------------------------------
