Updated Branches: refs/heads/trunk 190974b51 -> 7f8ac565e
GIRAPH-659: giraph-hive tests all fail (majakabiljo) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/7f8ac565 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/7f8ac565 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/7f8ac565 Branch: refs/heads/trunk Commit: 7f8ac565e0629337e08f189399a3e0d18163db1b Parents: 190974b Author: Maja Kabiljo <[email protected]> Authored: Tue May 7 12:17:17 2013 -0700 Committer: Maja Kabiljo <[email protected]> Committed: Tue May 7 12:17:17 2013 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../io/internal/WrappedVertexOutputFormat.java | 8 ++++---- pom.xml | 3 +-- 3 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/7f8ac565/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 07006f1..17e28da 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-659: giraph-hive tests all fail (majakabiljo) + GIRAPH-661: Munge symbols helper (nitay) GIRAPH-662: Incubator release should point to archived (aching) http://git-wip-us.apache.org/repos/asf/giraph/blob/7f8ac565/giraph-core/src/main/java/org/apache/giraph/io/internal/WrappedVertexOutputFormat.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/io/internal/WrappedVertexOutputFormat.java b/giraph-core/src/main/java/org/apache/giraph/io/internal/WrappedVertexOutputFormat.java index e5b9ef7..8110209 100644 --- a/giraph-core/src/main/java/org/apache/giraph/io/internal/WrappedVertexOutputFormat.java +++ b/giraph-core/src/main/java/org/apache/giraph/io/internal/WrappedVertexOutputFormat.java @@ -25,9 +25,9 @@ import org.apache.giraph.io.VertexWriter; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.mapreduce.JobContext; -/*if_not[HADOOP_NON_SECURE]*/ +/*if_not[HADOOP_NON_COMMIT_JOB]*/ import org.apache.hadoop.mapreduce.JobStatus; -/*end[HADOOP_NON_SECURE]*/ +/*end[HADOOP_NON_COMMIT_JOB]*/ import org.apache.hadoop.mapreduce.OutputCommitter; import org.apache.hadoop.mapreduce.TaskAttemptContext; @@ -148,7 +148,7 @@ public class WrappedVertexOutputFormat<I extends WritableComparable, outputCommitter.cleanupJob(context); } - /*if_not[HADOOP_NON_SECURE]*/ + /*if_not[HADOOP_NON_COMMIT_JOB]*/ @Override public void commitJob(JobContext context) throws IOException { getConf().updateConfiguration(context.getConfiguration()); @@ -161,7 +161,7 @@ public class WrappedVertexOutputFormat<I extends WritableComparable, getConf().updateConfiguration(context.getConfiguration()); outputCommitter.abortJob(context, state); } - /*end[HADOOP_NON_SECURE]*/ + /*end[HADOOP_NON_COMMIT_JOB]*/ }; } } http://git-wip-us.apache.org/repos/asf/giraph/blob/7f8ac565/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 67dc913..958a7df 100644 --- a/pom.xml +++ b/pom.xml @@ -653,11 +653,10 @@ under the License. <module>giraph-accumulo</module> <module>giraph-hbase</module> <module>giraph-hcatalog</module> - <module>giraph-hive</module> </modules> <properties> <hadoop.version>0.20.2</hadoop.version> - <munge.symbols>HADOOP_NON_SECURE,HADOOP_NON_JOBCONTEXT_IS_INTERFACE</munge.symbols> + <munge.symbols>HADOOP_NON_SECURE,HADOOP_NON_JOBCONTEXT_IS_INTERFACE,HADOOP_NON_COMMIT_JOB</munge.symbols> </properties> <dependencies> <!-- sorted lexicographically -->
