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

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

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

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

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

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

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

Merge branch '1.6' into 1.7 Conflicts: proxy/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/84ccd5ce Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/84ccd5ce Diff: http://git-wip-us.apache.or

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

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