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/0c37eeb9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c37eeb9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c37eeb9 Branch: refs/heads/master Commit: 0c37eeb9d12b5c8bd6080bc4a09a3bdc96ec45b9 Parents: fae1636 ff0693c Author: Eric C. Newton <eric.new...@gmail.com> Authored: Fri Mar 21 13:00:59 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Fri Mar 21 13:00:59 2014 -0400 ---------------------------------------------------------------------- .../accumulo/test/functional/BloomFilterIT.java | 18 +++++++++--------- test/src/test/resources/log4j.properties | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
