Updated Branches: refs/heads/1.6.0-SNAPSHOT bc65b369c -> de4f71e27
ACCUMULO-1009 Another javadoc problem fixed Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/de4f71e2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/de4f71e2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/de4f71e2 Branch: refs/heads/1.6.0-SNAPSHOT Commit: de4f71e27160b8e86bcd73fcea105024d74da642 Parents: bc65b36 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Nov 19 18:54:07 2013 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Nov 19 18:54:07 2013 -0500 ---------------------------------------------------------------------- .../core/client/mapreduce/lib/util/ConfiguratorBase.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/de4f71e2/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java index c0fcc72..9189150 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java @@ -289,15 +289,11 @@ public class ConfiguratorBase { /** * Configures a {@link ZooKeeperInstance} for this job. - * + * * @param implementingClass * the class whose name will be used as a prefix for the property configuration key * @param conf * the Hadoop configuration object to configure - * @param instanceName - * the Accumulo instance name - * @param zooKeepers - * a comma-separated list of zookeeper servers * @param clientConfig * client configuration for specifying connection timeouts, SSL connection options, etc. * @since 1.5.0 @@ -342,7 +338,7 @@ public class ConfiguratorBase { * the Hadoop configuration object to configure * @return an Accumulo instance * @since 1.5.0 - * @see #setZooKeeperInstance(Class, Configuration, String, String, ClientConfiguration) + * @see #setZooKeeperInstance(Class, Configuration, ClientConfiguration) * @see #setMockInstance(Class, Configuration, String) */ public static Instance getInstance(Class<?> implementingClass, Configuration conf) {
