Author: rvs
Date: Wed Nov 30 05:25:37 2011
New Revision: 1208285
URL: http://svn.apache.org/viewvc?rev=1208285&view=rev
Log:
Making patch apply cleanly
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/patch
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/patch
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/patch?rev=1208285&r1=1208284&r2=1208285&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/patch
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/patch
Wed Nov 30 05:25:37 2011
@@ -2128,15 +2128,6 @@ Index: ql/src/java/org/apache/hadoop/hiv
// If fatal errors happen we should kill the job immediately rather than
// let the job retry several times, which eventually lead to failure.
-@@ -310,7 +311,7 @@
- errMsg.setLength(0);
-
- updateCounters(ctrs, rj);
--
-+
- // Prepare data for Client Stat Publishers (if any present) and execute
them
- if (clientStatPublishers.size() > 0 && ctrs != null) {
- Map<String, Double> exctractedCounters =
extractAllCounterValues(ctrs);
@@ -657,6 +658,7 @@
public int progress(RunningJob rj, JobClient jc) throws IOException {
