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

Merge branch '1.6' into 1.7 Conflicts: test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/071c32f5 Tree: http://git-wip-us.apache.org/repos/asf/accumu

[3/6] accumulo git commit: ACCUMULO-3966 Fix broken AuditMessageIT

ACCUMULO-3966 Fix broken AuditMessageIT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a541e766 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a541e766 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/d

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

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/4dee3c17 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4dee3c17 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4dee3c17 Branch:

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

Merge branch '1.6' into 1.7 Conflicts: test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/071c32f5 Tree: http://git-wip-us.apache.org/repos/asf/accumu

[1/6] accumulo git commit: ACCUMULO-3966 Fix broken AuditMessageIT

Repository: accumulo Updated Branches: refs/heads/1.6 00c275b1f -> a541e766e refs/heads/1.7 d5d883cbb -> 071c32f5c refs/heads/master 7c146e0fc -> 4dee3c174 ACCUMULO-3966 Fix broken AuditMessageIT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apach

[2/6] accumulo git commit: ACCUMULO-3966 Fix broken AuditMessageIT

ACCUMULO-3966 Fix broken AuditMessageIT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a541e766 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a541e766 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/d