You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by mw...@apache.org on 2017/03/06 19:40:20 UTC

[2/2] accumulo git commit: Merge branch 'native-conf'

Merge branch 'native-conf'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a1cf8e22
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a1cf8e22
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a1cf8e22

Branch: refs/heads/master
Commit: a1cf8e222ea69dd8a7c243f27cf790205bb636e5
Parents: 1072d20 659a33e
Author: Mike Walch <mw...@apache.org>
Authored: Mon Mar 6 14:39:21 2017 -0500
Committer: Mike Walch <mw...@apache.org>
Committed: Mon Mar 6 14:39:21 2017 -0500

----------------------------------------------------------------------
 assemble/bin/accumulo                           | 34 +++++------
 assemble/bin/accumulo-service                   |  8 ++-
 assemble/bin/accumulo-util                      | 28 ++++-----
 assemble/conf/templates/accumulo-env.sh         | 45 +++++++++------
 .../org/apache/accumulo/tserver/NativeMap.java  | 60 +++++++++-----------
 .../org/apache/accumulo/test/InMemoryMapIT.java |  5 +-
 .../accumulo/test/functional/NativeMapIT.java   |  4 +-
 7 files changed, 88 insertions(+), 96 deletions(-)
----------------------------------------------------------------------