Merge branch '1.6' into 1.7

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

Branch: refs/heads/1.7
Commit: 98f42c7629b470f2d1833603a834a18fc59f7776
Parents: 9546b10 7813f50
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Mon May 11 14:06:42 2015 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Mon May 11 14:06:42 2015 -0400

----------------------------------------------------------------------
 assemble/bin/build_native_library.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


Reply via email to