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/d30a76fd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d30a76fd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d30a76fd Branch: refs/heads/master Commit: d30a76fde38cf437dd8da1275503287f433f6890 Parents: 592d7d6 47ca312 Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Jan 16 10:41:40 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Jan 16 10:41:40 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/file/BloomFilterLayer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d30a76fd/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java ----------------------------------------------------------------------
