[2/2] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo 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/1873fc56 Tree:

[3/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/abb4f914 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/abb4f914 Diff:

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

[1/4] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

Updated Branches: refs/heads/1.6.0-SNAPSHOT 1873fc565 - a573f96d4 refs/heads/master abb4f9147 - 86a26fe67 Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[2/4] git commit: ACCUMULO-1743 wait for the trace table to exist

ACCUMULO-1743 wait for the trace table to exist Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a573f96d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a573f96d Diff:

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

[3/4] git commit: ACCUMULO-1743 wait for the trace table to exist

ACCUMULO-1743 wait for the trace table to exist Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a573f96d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a573f96d Diff:

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

[1/2] git commit: ACCUMULO-2102 Fix for intermittent failures of ShellSetInstanceTest by Bill Havanki

Updated Branches: refs/heads/master 86a26fe67 - aede331c2 ACCUMULO-2102 Fix for intermittent failures of ShellSetInstanceTest by Bill Havanki I think the problem may lie in the use of SiteConfiguration by the Shell. It only creates a single static instance object during the run, so after

git commit: ACCUMULO-2102 Fix for intermittent failures of ShellSetInstanceTest by Bill Havanki

Updated Branches: refs/heads/1.6.0-SNAPSHOT a573f96d4 - 2654ba56f ACCUMULO-2102 Fix for intermittent failures of ShellSetInstanceTest by Bill Havanki I think the problem may lie in the use of SiteConfiguration by the Shell. It only creates a single static instance object during the run, so

[1/2] git commit: ACCUMULO-2120 Plugin declarations belong in pluginManagement not as a dependency.

Updated Branches: refs/heads/1.5.1-SNAPSHOT 8729dba76 - 652b5af39 ACCUMULO-2120 Plugin declarations belong in pluginManagement not as a dependency. Move the delcaration of the plugin out of dependencyManagement and into pluginManagement. Pull the configuration (skipNoGit) into that plugin

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

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

Updated Branches: refs/heads/1.6.0-SNAPSHOT 2654ba56f - 4c2652b23 Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT 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/652b5af3 Tree:

[2/3] 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: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4c2652b2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4c2652b2 Diff:

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

[2/2] 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: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4c2652b2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4c2652b2 Diff:

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

Updated Branches: refs/heads/master aede331c2 - 09247cdd3 Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT 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/652b5af3 Tree:

[1/2] git commit: ACCUMULO-2090 Add a slightly better exception catching on randomwalk RenameTable

Updated Branches: refs/heads/master 09247cdd3 - 8b8c61532 ACCUMULO-2090 Add a slightly better exception catching on randomwalk RenameTable We know a few things when we catch this exception, but we can't definitely make assertions about what was correct/incorrect because the namespaces could

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

git commit: ACCUMULO-1973 Add a warning if we don't find non-default values for namenode configuration

Updated Branches: refs/heads/1.4.5-SNAPSHOT adaf05790 - 79ff4f1bb ACCUMULO-1973 Add a warning if we don't find non-default values for namenode configuration This is one of biggest confusions that new users seem to run into when trying to initialize Accumulo (as it's a problem with us not

[1/2] git commit: ACCUMULO-1973 Add a warning if we don't find non-default values for namenode configuration

Updated Branches: refs/heads/1.5.1-SNAPSHOT 652b5af39 - 536211b3c ACCUMULO-1973 Add a warning if we don't find non-default values for namenode configuration This is one of biggest confusions that new users seem to run into when trying to initialize Accumulo (as it's a problem with us not

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

[1/3] git commit: ACCUMULO-1973 Add a warning if we don't find non-default values for namenode configuration

Updated Branches: refs/heads/1.6.0-SNAPSHOT 29bdceb4e - 766eb2232 ACCUMULO-1973 Add a warning if we don't find non-default values for namenode configuration This is one of biggest confusions that new users seem to run into when trying to initialize Accumulo (as it's a problem with us not

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

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

Merge branch '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/766eb223 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/766eb223 Diff:

[1/4] git commit: ACCUMULO-1973 Add a warning if we don't find non-default values for namenode configuration

Updated Branches: refs/heads/master 8b8c61532 - d82aa229b ACCUMULO-1973 Add a warning if we don't find non-default values for namenode configuration This is one of biggest confusions that new users seem to run into when trying to initialize Accumulo (as it's a problem with us not finding

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

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

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

Merge branch '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/766eb223 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/766eb223 Diff:

git commit: ACCUMULO-2127 Add note to append hadoop2 classpath entries in example configs

Updated Branches: refs/heads/1.4.5-SNAPSHOT 79ff4f1bb - a561152c8 ACCUMULO-2127 Add note to append hadoop2 classpath entries in example configs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a561152c Tree:

[1/2] git commit: ACCUMULO-2127 Add note to append hadoop2 classpath entries in example configs

Updated Branches: refs/heads/1.5.1-SNAPSHOT 536211b3c - b93e8d8d6 ACCUMULO-2127 Add note to append hadoop2 classpath entries in example configs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a561152c Tree:

[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 Conflicts: conf/examples/2GB/standalone/accumulo-site.xml Also update the vfs-classloader general.classpaths example to match the rest of the examples Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

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

[1/4] git commit: ACCUMULO-2127 Add note to append hadoop2 classpath entries in example configs

Updated Branches: refs/heads/master d82aa229b - a88df142f ACCUMULO-2127 Add note to append hadoop2 classpath entries in example configs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a561152c Tree:

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

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: conf/examples/2GB/standalone/accumulo-site.xml Also update the vfs-classloader general.classpaths example to match the rest of the examples Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[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 Conflicts: conf/examples/2GB/standalone/accumulo-site.xml Also update the vfs-classloader general.classpaths example to match the rest of the examples Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[1/3] git commit: ACCUMULO-2127 Add note to append hadoop2 classpath entries in example configs

Updated Branches: refs/heads/1.6.0-SNAPSHOT 766eb2232 - a871d59b8 ACCUMULO-2127 Add note to append hadoop2 classpath entries in example configs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a561152c Tree:

[3/4] 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: conf/examples/1GB/native-standalone/accumulo-site.xml conf/examples/1GB/standalone/accumulo-site.xml conf/examples/2GB/native-standalone/accumulo-site.xml conf/examples/2GB/standalone/accumulo-site.xml

[2/3] git commit: ACCUMULO-2126 Pre-emptively update the comments in the example configs

ACCUMULO-2126 Pre-emptively update the comments in the example configs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c44fa4f3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c44fa4f3 Diff:

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

[1/3] git commit: ACCUMULO-2126 Pre-emptively update the comments in the example configs

Updated Branches: refs/heads/1.6.0-SNAPSHOT a871d59b8 - c44fa4f37 refs/heads/master a88df142f - 1bfa738a7 ACCUMULO-2126 Pre-emptively update the comments in the example configs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

git commit: ACCUMULO-2079 Prevent table creation in system namespace

Updated Branches: refs/heads/1.6.0-SNAPSHOT c44fa4f37 - 764884e75 ACCUMULO-2079 Prevent table creation in system namespace Consolidated code that checked for preconditions in fate operations, and made the checks more explicit and readable, which common exception handling. This does not

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