[5/5] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'

Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f115f197 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f115f197 Diff: http://git-wip-us.apache.org/repos/a

[4/5] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3751c67c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3751c67c Diff: http://git-wip-u

[3/5] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/be26f791 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/be26f791 Diff: http://git-wip-us.apache.org/repos/asf/

[2/5] git commit: ACCUMULO-1591 Master and Logger will fail out if secrets mismatch (tserver already does)

ACCUMULO-1591 Master and Logger will fail out if secrets mismatch (tserver already does) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d362d16a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d362d16a Diff:

[1/5] git commit: ACCUMULO-2012 Cloning accumulo.metadata works, accumulo.root will have a better error

Updated Branches: refs/heads/master 92e2f8e48 -> f115f1979 ACCUMULO-2012 Cloning accumulo.metadata works, accumulo.root will have a better error Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d4c9ee1c Tree: http://

[1/2] git commit: ACCUMULO-1591 Master and Logger will fail out if secrets mismatch (tserver already does)

Updated Branches: refs/heads/1.5.1-SNAPSHOT 613da730a -> be26f7916 ACCUMULO-1591 Master and Logger will fail out if secrets mismatch (tserver already does) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d362d16a Tr

[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/be26f791 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/be26f791 Diff: http://git-wip-us.apache.org/repos/asf/

[2/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/be26f791 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/be26f791 Diff: http://git-wip-us.apache.org/repos/asf/

[1/3] git commit: ACCUMULO-1591 Master and Logger will fail out if secrets mismatch (tserver already does)

Updated Branches: refs/heads/1.6.0-SNAPSHOT d4c9ee1c5 -> 3751c67c3 ACCUMULO-1591 Master and Logger will fail out if secrets mismatch (tserver already does) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d362d16a Tr

[3/3] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3751c67c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3751c67c Diff: http://git-wip-u

git commit: ACCUMULO-1591 Master and Logger will fail out if secrets mismatch (tserver already does)

Updated Branches: refs/heads/1.4.5-SNAPSHOT cabe14a15 -> d362d16ac ACCUMULO-1591 Master and Logger will fail out if secrets mismatch (tserver already does) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d362d16a Tr

git commit: ACCUMULO-2012 Cloning accumulo.metadata works, accumulo.root will have a better error

Updated Branches: refs/heads/1.6.0-SNAPSHOT 7e95b3fa7 -> d4c9ee1c5 ACCUMULO-2012 Cloning accumulo.metadata works, accumulo.root will have a better error Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d4c9ee1c Tree:

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/92e2f8e4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/92e2f8e4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/92e2f8

[3/6] git commit: ACCUMULO-2275 Fix options for LotsOfTablets

ACCUMULO-2275 Fix options for LotsOfTablets Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/613da730 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/613da730 Diff: http://git-wip-us.apache.org/repos/asf/accumu

[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/system/auto/simple/tablets.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7e95b3fa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree

[2/6] git commit: ACCUMULO-2275 Fix options for LotsOfTablets

ACCUMULO-2275 Fix options for LotsOfTablets Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/613da730 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/613da730 Diff: http://git-wip-us.apache.org/repos/asf/accumu

[1/6] git commit: ACCUMULO-2275 Fix options for LotsOfTablets

Updated Branches: refs/heads/1.5.1-SNAPSHOT 6716227f4 -> 613da730a refs/heads/1.6.0-SNAPSHOT 3eccc3533 -> 7e95b3fa7 refs/heads/master 5e6da84c4 -> 92e2f8e48 ACCUMULO-2275 Fix options for LotsOfTablets Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.

[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/system/auto/simple/tablets.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7e95b3fa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree

[06/12] git commit: ACCUMULO-2279 Add use of timeout_factor

ACCUMULO-2279 Add use of timeout_factor Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6716227f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6716227f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/d

[08/12] git commit: ACCUMULO-2276 Re-fix the package names to the correct ones.

ACCUMULO-2276 Re-fix the package names to the correct ones. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25a0493e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25a0493e Diff: http://git-wip-us.apache.org/

[05/12] git commit: ACCUMULO-2276 Re-fix the package names to the correct ones.

ACCUMULO-2276 Re-fix the package names to the correct ones. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25a0493e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25a0493e Diff: http://git-wip-us.apache.org/

[07/12] git commit: ACCUMULO-2276 Re-fix the package names to the correct ones.

ACCUMULO-2276 Re-fix the package names to the correct ones. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25a0493e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25a0493e Diff: http://git-wip-us.apache.org/

[11/12] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java test/system/auto/simple/zoo.py test/system/auto/simple/zo

[12/12] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5e6da84c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e6da84c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e6da8

[10/12] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java test/system/auto/simple/zoo.py test/system/auto/simple/zo

[03/12] git commit: ACCUMULO-2275 Fix up the options provided to work with TestIngest.

ACCUMULO-2275 Fix up the options provided to work with TestIngest. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/265a99b8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/265a99b8 Diff: http://git-wip-us.apac

[09/12] git commit: ACCUMULO-2279 Add use of timeout_factor

ACCUMULO-2279 Add use of timeout_factor Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6716227f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6716227f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/d

[01/12] git commit: ACCUMULO-2279 Add use of timeout_factor

Updated Branches: refs/heads/1.5.1-SNAPSHOT cabdbe829 -> 6716227f4 refs/heads/1.6.0-SNAPSHOT d22816cb4 -> 3eccc3533 refs/heads/master 008540105 -> 5e6da84c4 ACCUMULO-2279 Add use of timeout_factor Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apac

[04/12] git commit: ACCUMULO-2275 Fix up the options provided to work with TestIngest.

ACCUMULO-2275 Fix up the options provided to work with TestIngest. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/265a99b8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/265a99b8 Diff: http://git-wip-us.apac

[02/12] git commit: ACCUMULO-2275 Fix up the options provided to work with TestIngest.

ACCUMULO-2275 Fix up the options provided to work with TestIngest. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/265a99b8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/265a99b8 Diff: http://git-wip-us.apac

[1/3] git commit: ACCUMULO-2083 - adding test for 0 byte in Key with regexes

Updated Branches: refs/heads/master b8f2b72c2 -> 008540105 ACCUMULO-2083 - adding test for 0 byte in Key with regexes Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cabdbe82 Tree: http://git-wip-us.apache.org/repos/

[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/00854010 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/00854010 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/008540

[1/2] git commit: ACCUMULO-2083 - adding test for 0 byte in Key with regexes

Updated Branches: refs/heads/1.6.0-SNAPSHOT 3f92e0129 -> d22816cb4 ACCUMULO-2083 - adding test for 0 byte in Key with regexes Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cabdbe82 Tree: http://git-wip-us.apache.or

[2/2] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commi

[2/3] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commi

git commit: ACCUMULO-2083 - adding test for 0 byte in Key with regexes

Updated Branches: refs/heads/1.5.1-SNAPSHOT 16e095fde -> cabdbe829 ACCUMULO-2083 - adding test for 0 byte in Key with regexes Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cabdbe82 Tree: http://git-wip-us.apache.or