[2/3] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ba3dea16 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ba3dea16 Diff:

[2/2] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ba3dea16 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ba3dea16 Diff:

accumulo git commit: ACCUMULO-4619 fix split hanging on Error

Repository: accumulo Updated Branches: refs/heads/1.7 4ba5faf49 -> 8c0f03ac2 ACCUMULO-4619 fix split hanging on Error Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8c0f03ac Tree:

[1/3] accumulo git commit: ACCUMULO-4619 fix split hanging on Error

Repository: accumulo Updated Branches: refs/heads/master 2ab04606d -> f09af2e8a ACCUMULO-4619 fix split hanging on Error Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8c0f03ac Tree:

[3/3] accumulo git commit: Merge branch '1.8'

Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f09af2e8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f09af2e8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f09af2e8

[1/2] accumulo git commit: ACCUMULO-4619 fix split hanging on Error

Repository: accumulo Updated Branches: refs/heads/1.8 8d6b7299e -> ba3dea165 ACCUMULO-4619 fix split hanging on Error Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8c0f03ac Tree:

accumulo git commit: ACCUMULO-4618 Updates from additional code review

Repository: accumulo Updated Branches: refs/heads/master 82860ca44 -> 2ab04606d ACCUMULO-4618 Updates from additional code review * Now using only one httpclient jar * Excluded xerces from hadoop-client & hadoop-minicluster to stop xml-apis jar from being brought in. * Added slf4j-log4j12