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/fd0ff920 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd0ff920 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fd0ff920 Branch: refs/heads/master Commit: fd0ff92044ad8c02f2a1675c9089cd044e078bcf Parents: 061a641 f65beca Author: Josh Elser <els...@apache.org> Authored: Thu Dec 5 22:52:56 2013 -0500 Committer: Josh Elser <els...@apache.org> Committed: Thu Dec 5 22:52:56 2013 -0500 ---------------------------------------------------------------------- bin/build_native_library.sh | 2 +- .../org/apache/accumulo/core/file/rfile/bcfile/BCFile.java | 2 +- .../src/main/java/org/apache/accumulo/tserver/NativeMap.java | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
