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/10/01 18:47:54 UTC

[4/6] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7

This merges ACCUMULO-4015 commits with -s ours, since that fix only
applies to the Hadoop 1 profile for Accumulo versions 1.6.x and does not
apply to 1.7 and later, which only support Hadoop 2.


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

Branch: refs/heads/master
Commit: 38f36e26e31877d24c833ea1c090408635400816
Parents: f592180 e24bd36
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Oct 1 12:45:58 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Oct 1 12:45:58 2015 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------