You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/01/24 03:34:23 UTC
[5/9] 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/028b3c51
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/028b3c51
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/028b3c51
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 028b3c51ee382c0a3e22875677afbc8cc2c37a9d
Parents: 27be9fb 59680b3
Author: Josh Elser <el...@apache.org>
Authored: Thu Jan 23 21:23:58 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jan 23 21:26:20 2014 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/core/client/mapred/InputFormatBase.java | 2 +-
.../org/apache/accumulo/core/client/mapreduce/InputFormatBase.java | 2 +-
.../accumulo/core/client/mapreduce/lib/util/InputConfigurator.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/028b3c51/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/028b3c51/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/028b3c51/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
index e31a265,b0e649b..270c5a1
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
@@@ -471,7 -446,7 +471,7 @@@ public class InputConfigurator extends
*
* <p>
* Reading the offline table will create the scan time iterator stack in the map process. So any iterators that are configured for the table will need to be
-- * on the mapper's classpath. The accumulo-site.xml may need to be on the mapper's classpath if HDFS or the Accumulo directory in HDFS are non-standard.
++ * on the mapper's classpath.
*
* <p>
* One way to use this feature is to clone a table, take the clone offline, and use the clone as the input table for a map reduce job. If you plan to map