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/d6b1e9a9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d6b1e9a9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d6b1e9a9 Branch: refs/heads/master Commit: d6b1e9a959c7e52e571ce9997ae6915780773307 Parents: d37f05f c9c3fdd Author: Dave Marion <dlmar...@hotmail.com> Authored: Fri May 23 22:48:30 2014 -0400 Committer: Dave Marion <dlmar...@hotmail.com> Committed: Fri May 23 22:48:30 2014 -0400 ---------------------------------------------------------------------- .../accumulo/core/file/BloomFilterLayer.java | 19 ++++++++++++++++--- .../core/iterators/AggregatingIterator.java | 6 +++++- .../aggregation/conf/AggregatorSet.java | 3 ++- .../iterators/conf/ColumnToClassMapping.java | 16 +++++++++++++--- .../master/balancer/TableLoadBalancer.java | 9 ++++++++- .../java/org/apache/accumulo/master/Master.java | 14 ++++++++++++++ 6 files changed, 58 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d6b1e9a9/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d6b1e9a9/server/master/src/main/java/org/apache/accumulo/master/Master.java ----------------------------------------------------------------------
