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

[elserj]

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
        
core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
        
core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b2008ca9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b2008ca9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b2008ca9

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: b2008ca92a6861c75e6f531176461a4d3e33c403
Parents: a694e9a 0607c8c
Author: Josh Elser <els...@apache.org>
Authored: Thu Apr 10 23:49:32 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Thu Apr 10 23:49:32 2014 -0400

----------------------------------------------------------------------
 .../apache/accumulo/core/client/mapred/InputFormatBase.java    | 4 ++++
 .../apache/accumulo/core/client/mapreduce/InputFormatBase.java | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b2008ca9/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
----------------------------------------------------------------------
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
index 8cd63bc,e2ab25a..f2ac488
--- 
a/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
@@@ -349,12 -917,13 +349,16 @@@ public abstract class InputFormatBase<K
        super();
      }
  
 -    public RangeInputSplit(RangeInputSplit split) throws IOException {
 -      this.setRange(split.getRange());
 -      this.setLocations(split.getLocations());
 +    public RangeInputSplit(RangeInputSplit other) throws IOException {
 +      super(other);
 +    }
 +
 +    public RangeInputSplit(String table, String tableId, Range range, 
String[] locations) {
 +      super(table, tableId, range, locations);
      }
+ 
+     protected RangeInputSplit(String table, Range range, String[] locations) {
 -      super(range, locations);
++      super(table, "", range, locations);
+     }
    }
  }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b2008ca9/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
----------------------------------------------------------------------
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
index e3ac3cb,4c88bd5..a934d71
--- 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
@@@ -356,12 -1329,13 +356,16 @@@ public abstract class InputFormatBase<K
        super();
      }
  
 -    public RangeInputSplit(RangeInputSplit split) throws IOException {
 -      this.setRange(split.getRange());
 -      this.setLocations(split.getLocations());
 +    public RangeInputSplit(RangeInputSplit other) throws IOException {
 +      super(other);
      }
  
-     protected RangeInputSplit(String table, String tableId, Range range, 
String[] locations) {
+     protected RangeInputSplit(String table, Range range, String[] locations) {
 -      super(range, locations);
++      super(table, "", range, locations);
++    }
++
++    public RangeInputSplit(String table, String tableId, Range range, 
String[] locations) {
 +      super(table, tableId, range, locations);
      }
    }
  }