[2/3] accumulo git commit: ACCUMULO-4422 Initialize logging as first step in server initialization.

2016-08-25 Thread busbey
ACCUMULO-4422 Initialize logging as first step in server initialization. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/679a1c3e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/679a1c3e Diff: http://git-wip-u

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

2016-08-25 Thread busbey
Merge branch '1.6' into 1.7 Conflicts: server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java server/master/src/main/java/org/apache/accumulo/master/Master.java server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java server/tracer

[1/3] accumulo git commit: ACCUMULO-4422 Initialize logging as first step in server initialization.

2016-08-25 Thread busbey
Repository: accumulo Updated Branches: refs/heads/1.6 82f173496 -> 679a1c3eb refs/heads/1.7 ffd50280b -> 371db68cf ACCUMULO-4422 Initialize logging as first step in server initialization. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repo