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/edf65954 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/edf65954 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/edf65954 Branch: refs/heads/master Commit: edf6595446df07664bf2689e429f22230f7a5daf Parents: 0dda8a5 0930732 Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Mar 11 16:31:09 2014 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Mar 11 16:31:09 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/proxy/SimpleProxyIT.java | 13 ++++----- .../org/apache/accumulo/test/NamespacesIT.java | 8 +++--- .../accumulo/test/functional/BloomFilterIT.java | 30 ++++++++++++-------- 3 files changed, 28 insertions(+), 23 deletions(-) ----------------------------------------------------------------------