You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2015/05/28 22:57:13 UTC
[5/7] accumulo git commit: Merge branch '1.6' into 1.7
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/f7b09300
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f7b09300
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f7b09300
Branch: refs/heads/master
Commit: f7b0930065e490f4b8fe670fad5a8b706dd4ae3d
Parents: 84d614d 6f7bf39
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 16:56:13 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 16:56:13 2015 -0400
----------------------------------------------------------------------
server/native/src/main/resources/Makefile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f7b09300/server/native/src/main/resources/Makefile
----------------------------------------------------------------------