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

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

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

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

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

Merge branch '1.7' Conflicts: test/src/test/java/org/apache/accumulo/test/proxy/TestProxyClient.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0b7d8eea Tree: http://git-wip-us.apache.org/repos/asf/accumulo

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

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

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

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

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

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