[5/6] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9a1c774e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9a1c774e Diff: http://git-wip-us.apache.org/repo

[1/6] accumulo git commit: ACCUMULO-3605 Suppress xerces warnings from rat plugin

Repository: accumulo Updated Branches: refs/heads/1.5 a1fe8177d -> c92c3c4f6 refs/heads/1.6 5a6e85896 -> 9a1c774e1 refs/heads/master 8f4afc5a3 -> 50d351201 ACCUMULO-3605 Suppress xerces warnings from rat plugin Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://g

[3/6] accumulo git commit: ACCUMULO-3605 Suppress xerces warnings from rat plugin

ACCUMULO-3605 Suppress xerces warnings from rat plugin Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c92c3c4f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c92c3c4f Diff: http://git-wip-us.apache.org/repos

[4/6] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9a1c774e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9a1c774e Diff: http://git-wip-us.apache.org/repo

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

[2/6] accumulo git commit: ACCUMULO-3605 Suppress xerces warnings from rat plugin

ACCUMULO-3605 Suppress xerces warnings from rat plugin Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c92c3c4f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c92c3c4f Diff: http://git-wip-us.apache.org/repos

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

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

[1/2] accumulo git commit: ACCUMULO-3601 cherry picked migration fix to 1.5

Repository: accumulo Updated Branches: refs/heads/1.6 4936b37f6 -> 5a6e85896 ACCUMULO-3601 cherry picked migration fix to 1.5 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a1fe8177 Tree: http://git-wip-us.apache.or

accumulo git commit: ACCUMULO-3601 cherry picked migration fix to 1.5

Repository: accumulo Updated Branches: refs/heads/1.5 bd981c886 -> a1fe8177d ACCUMULO-3601 cherry picked migration fix to 1.5 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a1fe8177 Tree: http://git-wip-us.apache.or

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

[1/3] accumulo git commit: ACCUMULO-3601 cherry picked migration fix to 1.5

Repository: accumulo Updated Branches: refs/heads/master d97a6a2b1 -> 8f4afc5a3 ACCUMULO-3601 cherry picked migration fix to 1.5 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a1fe8177 Tree: http://git-wip-us.apache

[3/3] accumulo git commit: ACCUMULO-3601 transfer migration information to the metadata table filtering iterator

ACCUMULO-3601 transfer migration information to the metadata table filtering iterator Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d97a6a2b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d97a6a2b Diff: ht

[2/3] accumulo git commit: ACCUMULO-3601 transfer migration information to the metadata table filtering iterator

ACCUMULO-3601 transfer migration information to the metadata table filtering iterator Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f6635fa3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6635fa3 Diff: ht

[1/3] accumulo git commit: ACCUMULO-3601 transfer migration information to the metadata table filtering iterator

Repository: accumulo Updated Branches: refs/heads/master c8a30df18 -> d97a6a2b1 ACCUMULO-3601 transfer migration information to the metadata table filtering iterator Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4

accumulo git commit: ACCUMULO-3601 transfer migration information to the metadata table filtering iterator

Repository: accumulo Updated Branches: refs/heads/1.6 7a570bd88 -> 4936b37f6 ACCUMULO-3601 transfer migration information to the metadata table filtering iterator Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4936

[1/2] accumulo git commit: ACCUMULO-3603 fix timings in 1.6

Repository: accumulo Updated Branches: refs/heads/master a20484c25 -> c8a30df18 ACCUMULO-3603 fix timings in 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7a570bd8 Tree: http://git-wip-us.apache.org/repos/asf/a

accumulo git commit: ACCUMULO-3603 fix timings in 1.6

Repository: accumulo Updated Branches: refs/heads/1.6 c3a76f6cc -> 7a570bd88 ACCUMULO-3603 fix timings in 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7a570bd8 Tree: http://git-wip-us.apache.org/repos/asf/accu

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

[1/3] accumulo git commit: ACCUMULO-3603 port back to 1.6

Repository: accumulo Updated Branches: refs/heads/master dedede9a3 -> a20484c25 ACCUMULO-3603 port back to 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c3a76f6c Tree: http://git-wip-us.apache.org/repos/asf/acc

[3/3] accumulo git commit: ACCUMULO-3603 port back to 1.7

ACCUMULO-3603 port back to 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a20484c2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a20484c2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a2048

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

accumulo git commit: ACCUMULO-3603 port back to 1.6

Repository: accumulo Updated Branches: refs/heads/1.6 320f3f7eb -> c3a76f6cc ACCUMULO-3603 port back to 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c3a76f6c Tree: http://git-wip-us.apache.org/repos/asf/accumu

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

[1/2] accumulo git commit: ACCUMULO-3603 a test to attempt to reproduce

Repository: accumulo Updated Branches: refs/heads/master b92b8e3d6 -> dedede9a3 ACCUMULO-3603 a test to attempt to reproduce Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/320f3f7e Tree: http://git-wip-us.apache.org

accumulo git commit: ACCUMULO-3603 a test to attempt to reproduce

Repository: accumulo Updated Branches: refs/heads/1.6 f6dd62f71 -> 320f3f7eb ACCUMULO-3603 a test to attempt to reproduce Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/320f3f7e Tree: http://git-wip-us.apache.org/re

accumulo git commit: ACCUMULO-3603 a test to attempt to reproduce

Repository: accumulo Updated Branches: refs/heads/master 990dafbb2 -> b92b8e3d6 ACCUMULO-3603 a test to attempt to reproduce Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b92b8e3d Tree: http://git-wip-us.apache.org