[06/10] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8827e474 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8827e474 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8827e474

[06/10] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: server/src/main/java/org/apache/accumulo/server/master/Master.java server/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java

[06/10] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: assemble/build.sh Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c6d1ce59 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c6d1ce59 Diff: http://git-wip-us.apach

[06/10] accumulo git commit: Merge branch '1.5' into 1.6

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

[06/10] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/244eeb67 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/244eeb67 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/244eeb67