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

Posted to commits@accumulo.apache.org by el...@apache.org on 2014/05/21 03:59:38 UTC

[19/50] [abbrv] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT'


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

Branch: refs/heads/ACCUMULO-378
Commit: c312fa6f856e34a29a6d9497a7dbfd2ae96e43f1
Parents: dc69bc8 7ccf202
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri May 16 13:01:21 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri May 16 13:01:21 2014 -0400

----------------------------------------------------------------------
 bin/build_native_library.sh               | 1 +
 server/native/src/main/resources/Makefile | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------