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/3f21e5d9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3f21e5d9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3f21e5d9 Branch: refs/heads/master Commit: 3f21e5d93b94ca8625c69d0c0ecb8a1da49c4891 Parents: 9338b52 d30a76f Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Jan 16 10:41:58 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Jan 16 10:41:58 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/file/BloomFilterLayer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ----------------------------------------------------------------------