MAPREDUCE-3139. Merge from trunk to 0.22.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1196782 13f79535-47bb-0310-9956-ffa450edef68

mapreduce/CHANGES.txt

@@ -629,6 +629,8 @@ Release 0.22.0 - Unreleased
     MAPREDUCE-2328. Add memory-related configuration parameters to
     mapred-default.xml. (Harsh J via shv)
 
+    MAPREDUCE-3139. SlivePartitioner generates negative partitions. (jghoman)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES

mapreduce/src/test/mapred/org/apache/hadoop/fs/slive/SlivePartitioner.java

@@ -34,6 +34,6 @@ public class SlivePartitioner implements Partitioner<Text, Text> {
   @Override // Partitioner
   public int getPartition(Text key, Text value, int numPartitions) {
     OperationOutput oo = new OperationOutput(key, value);
-    return oo.getOperationType().hashCode() % numPartitions;
+    return (oo.getOperationType().hashCode() & Integer.MAX_VALUE) % numPartitions;
   }
 }