[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

Merge branch '1.6' Conflicts: server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7196b0c5 Tree: http://git-wip-us.apache.org/repos/as

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

Merge branch '1.6' Conflicts: test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/af3d11c4 Tree: http://git-wip-us.apache.org/repos/asf/accumul

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

Merge branch '1.6' Conflicts: server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apach

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

Merge branch '1.6' Conflicts: test/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5f21edfc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

Merge branch '1.6' Conflicts: test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a21d2d3c Tree: http://git-wip-us.apache.org/repos/asf/accumul

[3/3] git commit: Merge branch '1.6'

Merge branch '1.6' Conflicts: core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5640280d Tree: http://git-wip-us.apache.org/repos/asf/

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

Merge branch '1.6' Conflicts: server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/556b17c6 Tree: http://git-wip-us.apache.org/repos/a

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

Merge branch '1.6' Conflicts: core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e30594a6 Tree: http://git-wip-us.apache.org/repos/asf/accumul

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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

[3/3] git commit: Merge branch '1.6'

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