accumulo git commit: ACCUMULO-3953 Add missing license header.

2015-08-05 Thread elserj
Repository: accumulo Updated Branches: refs/heads/master ccc21487c - 774c2c7cf ACCUMULO-3953 Add missing license header. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/774c2c7c Tree:

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

2015-08-05 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b16c6453 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b16c6453 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b16c6453

[2/6] accumulo git commit: ACCUMULO-3952 Verify the log4j jar was found in the Hadoop installation.

2015-08-05 Thread elserj
ACCUMULO-3952 Verify the log4j jar was found in the Hadoop installation. The `find` command may fail (personally, ran into this when the cwd was a directory that was not readable by the user). We miss this and blindly proceed. Presently, Accumulo processes will fail miserably when log4j isn't

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

2015-08-05 Thread elserj
Merge branch '1.6' into 1.7 Conflicts: assemble/bin/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5f76160c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5f76160c Diff:

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

2015-08-05 Thread elserj
Merge branch '1.6' into 1.7 Conflicts: assemble/bin/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5f76160c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5f76160c Diff:

[1/6] accumulo git commit: ACCUMULO-3952 Verify the log4j jar was found in the Hadoop installation.

2015-08-05 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.6 48ad87a81 - 6425c37dc refs/heads/1.7 4dd8c5433 - 5f76160c1 refs/heads/master b8e19a4ac - b16c6453a ACCUMULO-3952 Verify the log4j jar was found in the Hadoop installation. The `find` command may fail (personally, ran into this when the

[3/6] accumulo git commit: ACCUMULO-3952 Verify the log4j jar was found in the Hadoop installation.

2015-08-05 Thread elserj
ACCUMULO-3952 Verify the log4j jar was found in the Hadoop installation. The `find` command may fail (personally, ran into this when the cwd was a directory that was not readable by the user). We miss this and blindly proceed. Presently, Accumulo processes will fail miserably when log4j isn't