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

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

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

Merge branch '1.7' 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/a5e4ae84 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a5e4ae84 Diff: http://git-wip-us.apache.org/rep

[10/10] 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/071f6fe0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/071f6fe0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/071f6fe0 Branch:

[10/10] 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/0c7ddfe9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c7ddfe9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c7ddfe9 Branch: