hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1295342 [2/2] - in /hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project: ./ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/local/ hadoop-mapreduce-client/hadoop-mapreduce-cl...
Date Wed, 29 Feb 2012 23:47:55 GMT
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java?rev=1295342&r1=1295341&r2=1295342&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java
Wed Feb 29 23:47:49 2012
@@ -68,7 +68,7 @@ public class TestRMWebServicesCapacitySc
     float maxCapacity;
     float absoluteCapacity;
     float absoluteMaxCapacity;
-    float utilization;
+    float absoluteUsedCapacity;
     int numApplications;
     String usedResources;
     String queueName;
@@ -252,7 +252,8 @@ public class TestRMWebServicesCapacitySc
     qi.absoluteCapacity = WebServicesTestUtils.getXmlFloat(qElem, "absoluteCapacity");
     qi.absoluteMaxCapacity =
         WebServicesTestUtils.getXmlFloat(qElem, "absoluteMaxCapacity");
-    qi.utilization = WebServicesTestUtils.getXmlFloat(qElem, "utilization");
+    qi.absoluteUsedCapacity =
+      WebServicesTestUtils.getXmlFloat(qElem, "absoluteUsedCapacity");
     qi.numApplications =
         WebServicesTestUtils.getXmlInt(qElem, "numApplications");
     qi.usedResources =
@@ -342,7 +343,7 @@ public class TestRMWebServicesCapacitySc
     qi.maxCapacity = (float) info.getDouble("maxCapacity");
     qi.absoluteCapacity = (float) info.getDouble("absoluteCapacity");
     qi.absoluteMaxCapacity = (float) info.getDouble("absoluteMaxCapacity");
-    qi.utilization = (float) info.getDouble("utilization");
+    qi.absoluteUsedCapacity = (float) info.getDouble("absoluteUsedCapacity");
     qi.numApplications = info.getInt("numApplications");
     qi.usedResources = info.getString("usedResources");
     qi.queueName = info.getString("queueName");
@@ -394,7 +395,8 @@ public class TestRMWebServicesCapacitySc
         parentAbsCapacity * (info.capacity/100), info.absoluteCapacity, 1e-3f);
     assertEquals("absoluteMaxCapacity doesn't match",
         expectAbsMaxCapacity, info.absoluteMaxCapacity, 1e-3f);
-    assertEquals("utilization doesn't match", 0, info.utilization, 1e-3f);
+    assertEquals("absoluteUsedCapacity doesn't match",
+        0, info.absoluteUsedCapacity, 1e-3f);
     assertEquals("numApplications doesn't match", 0, info.numApplications);
     assertTrue("usedResources doesn't match",
         info.usedResources.matches("memory: 0"));

Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java?rev=1295342&r1=1295341&r2=1295342&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java
Wed Feb 29 23:47:49 2012
@@ -38,7 +38,9 @@ import javax.servlet.http.HttpServletRes
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.cookie.CookiePolicy;
 import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.params.HttpClientParams;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.io.IOUtils;
@@ -124,7 +126,10 @@ public class WebAppProxyServlet extends 
       HttpServletResponse resp, URI link,Cookie c) throws IOException {
     org.apache.commons.httpclient.URI uri = 
       new org.apache.commons.httpclient.URI(link.toString(), false);
-    HttpClient client = new HttpClient();
+    HttpClientParams params = new HttpClientParams();
+    params.setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);
+    params.setBooleanParameter(HttpClientParams.ALLOW_CIRCULAR_REDIRECTS, true);
+    HttpClient client = new HttpClient(params);
     HttpMethod method = new GetMethod(uri.getEscapedURI());
 
     @SuppressWarnings("unchecked")
@@ -237,7 +242,11 @@ public class WebAppProxyServlet extends 
       }
       URI trackingUri = ProxyUriUtils.getUriFromAMUrl(
           applicationReport.getOriginalTrackingUrl());
-      
+      if(applicationReport.getOriginalTrackingUrl().equals("N/A")) {
+        notFound(resp, "The MRAppMaster died before writing anything.");
+        return;
+      }
+
       String runningUser = applicationReport.getUser();
       if(checkUser && !runningUser.equals(remoteUser)) {
         LOG.info("Asking "+remoteUser+" if they want to connect to the " +

Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ClusterSetup.apt.vm
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ClusterSetup.apt.vm?rev=1295342&r1=1295341&r2=1295342&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ClusterSetup.apt.vm
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ClusterSetup.apt.vm
Wed Feb 29 23:47:49 2012
@@ -185,7 +185,7 @@ Hadoop MapReduce Next Generation - Clust
 *-------------------------+-------------------------+------------------------+
 | <<<yarn.acl.enable>>> | | |
 | | <<<true>>> / <<<false>>> | |
-| | | Enable ACLs? Defaults to <true>. |
+| | | Enable ACLs? Defaults to <false>. |
 *-------------------------+-------------------------+------------------------+
 | <<<yarn.admin.acl>>> | | |
 | | Admin ACL | |

Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HistoryServerRest.apt.vm
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HistoryServerRest.apt.vm?rev=1295342&r1=1295341&r2=1295342&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HistoryServerRest.apt.vm
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HistoryServerRest.apt.vm
Wed Feb 29 23:47:49 2012
@@ -642,11 +642,11 @@ History Server REST API's.
    "jobAttempts" : {
       "jobAttempt" : [
          {
-            "nodeId" : "host.domain.com:45454",
-            "nodeHttpAddress" : "host.domain.com:9999",
+            "nodeId" : "host.domain.com:8041",
+            "nodeHttpAddress" : "host.domain.com:8042",
             "startTime" : 1326381444693,
             "id" : 1,
-            "logsLink" : "http://host.domain.com:19888/jobhistory/logs/host.domain.com:45454/container_1326381300833_0002_01_000001/job_1326381300833_2_2/user1",
+            "logsLink" : "http://host.domain.com:19888/jobhistory/logs/host.domain.com:8041/container_1326381300833_0002_01_000001/job_1326381300833_2_2/user1",
             "containerId" : "container_1326381300833_0002_01_000001"
          }
       ]
@@ -678,12 +678,12 @@ History Server REST API's.
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <jobAttempts>
   <jobAttempt>
-    <nodeHttpAddress>host.domain.com:9999</nodeHttpAddress>
-    <nodeId>host.domain.com:45454</nodeId>
+    <nodeHttpAddress>host.domain.com:8042</nodeHttpAddress>
+    <nodeId>host.domain.com:8041</nodeId>
     <id>1</id>
     <startTime>1326381444693</startTime>
     <containerId>container_1326381300833_0002_01_000001</containerId>
-    <logsLink>http://host.domain.com:19888/jobhistory/logs/host.domain.com:45454/container_1326381300833_0002_01_000001/job_1326381300833_2_2/user1</logsLink>
+    <logsLink>http://host.domain.com:19888/jobhistory/logs/host.domain.com:8041/container_1326381300833_0002_01_000001/job_1326381300833_2_2/user1</logsLink>
   </jobAttempt>
 </jobAttempts>
 +---+
@@ -2138,7 +2138,7 @@ History Server REST API's.
             "state" : "SUCCEEDED",
             "diagnostics" : "",
             "rack" : "/98.139.92.0",
-            "nodeHttpAddress" : "host.domain.com:9999",
+            "nodeHttpAddress" : "host.domain.com:8042",
             "startTime" : 1326381450680,
             "id" : "attempt_1326381300833_2_2_m_0_0",
             "type" : "MAP",
@@ -2180,7 +2180,7 @@ History Server REST API's.
     <id>attempt_1326381300833_2_2_m_0_0</id>
     <rack>/98.139.92.0</rack>
     <state>SUCCEEDED</state>
-    <nodeHttpAddress>host.domain.com:9999</nodeHttpAddress>
+    <nodeHttpAddress>host.domain.com:8042</nodeHttpAddress>
     <diagnostics/>
     <type>MAP</type>
     <assignedContainerId>container_1326381300833_0002_01_000002</assignedContainerId>
@@ -2287,7 +2287,7 @@ History Server REST API's.
       "state" : "SUCCEEDED",
       "diagnostics" : "",
       "rack" : "/98.139.92.0",
-      "nodeHttpAddress" : "host.domain.com:9999",
+      "nodeHttpAddress" : "host.domain.com:8042",
       "startTime" : 1326381450680,
       "id" : "attempt_1326381300833_2_2_m_0_0",
       "type" : "MAP",
@@ -2326,7 +2326,7 @@ History Server REST API's.
   <id>attempt_1326381300833_2_2_m_0_0</id>
   <rack>/98.139.92.0</rack>
   <state>SUCCEEDED</state>
-  <nodeHttpAddress>host.domain.com:9999</nodeHttpAddress>
+  <nodeHttpAddress>host.domain.com:8042</nodeHttpAddress>
   <diagnostics/>
   <type>MAP</type>
   <assignedContainerId>container_1326381300833_0002_01_000002</assignedContainerId>

Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/MapredAppMasterRest.apt.vm
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/MapredAppMasterRest.apt.vm?rev=1295342&r1=1295341&r2=1295342&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/MapredAppMasterRest.apt.vm
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/MapredAppMasterRest.apt.vm
Wed Feb 29 23:47:49 2012
@@ -602,11 +602,11 @@ MapReduce Application Master REST API's.
    "jobAttempts" : {
       "jobAttempt" : [
          {    
-            "nodeId" : "host.domain.com:45454",
-            "nodeHttpAddress" : "host.domain.com:9999",
+            "nodeId" : "host.domain.com:8041",
+            "nodeHttpAddress" : "host.domain.com:8042",
             "startTime" : 1326238773493,
             "id" : 1, 
-            "logsLink" : "http://host.domain.com:9999/node/containerlogs/container_1326232085508_0004_01_000001",
+            "logsLink" : "http://host.domain.com:8042/node/containerlogs/container_1326232085508_0004_01_000001",
             "containerId" : "container_1326232085508_0004_01_000001"
          }  
       ]
@@ -638,12 +638,12 @@ MapReduce Application Master REST API's.
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <jobAttempts>
   <jobAttempt>
-    <nodeHttpAddress>host.domain.com:9999</nodeHttpAddress>
-    <nodeId>host.domain.com:45454</nodeId>
+    <nodeHttpAddress>host.domain.com:8042</nodeHttpAddress>
+    <nodeId>host.domain.com:8041</nodeId>
     <id>1</id>
     <startTime>1326238773493</startTime>
     <containerId>container_1326232085508_0004_01_000001</containerId>
-    <logsLink>http://host.domain.com:9999/node/containerlogs/container_1326232085508_0004_01_000001</logsLink>
+    <logsLink>http://host.domain.com:8042/node/containerlogs/container_1326232085508_0004_01_000001</logsLink>
   </jobAttempt>
 </jobAttempts>
 +---+
@@ -2095,7 +2095,7 @@ MapReduce Application Master REST API's.
             "mergeFinishTime" : 1326238780099,
             "rack" : "/98.139.92.0",
             "elapsedReduceTime" : 0,
-            "nodeHttpAddress" : "host.domain.com:9999",
+            "nodeHttpAddress" : "host.domain.com:8042",
             "type" : "REDUCE",
             "startTime" : 1326238777460,
             "id" : "attempt_1326232085508_4_4_r_0_0",
@@ -2137,7 +2137,7 @@ MapReduce Application Master REST API's.
     <id>attempt_1326232085508_4_4_r_0_0</id>
     <rack>/98.139.92.0</rack>
     <state>RUNNING</state>
-    <nodeHttpAddress>host.domain.com:9999</nodeHttpAddress>
+    <nodeHttpAddress>host.domain.com:8042</nodeHttpAddress>
     <type>REDUCE</type>
     <assignedContainerId>container_1326232085508_0004_01_000003</assignedContainerId>
     <shuffleFinishTime>1326238780052</shuffleFinishTime>
@@ -2251,7 +2251,7 @@ MapReduce Application Master REST API's.
       "mergeFinishTime" : 1326238780099,
       "rack" : "/98.139.92.0",
       "elapsedReduceTime" : 0,
-      "nodeHttpAddress" : "host.domain.com:9999",
+      "nodeHttpAddress" : "host.domain.com:8042",
       "startTime" : 1326238777460,
       "id" : "attempt_1326232085508_4_4_r_0_0",
       "type" : "REDUCE",
@@ -2290,7 +2290,7 @@ MapReduce Application Master REST API's.
   <id>attempt_1326232085508_4_4_r_0_0</id>
   <rack>/98.139.92.0</rack>
   <state>RUNNING</state>
-  <nodeHttpAddress>host.domain.com:9999</nodeHttpAddress>
+  <nodeHttpAddress>host.domain.com:8042</nodeHttpAddress>
   <type>REDUCE</type>
   <assignedContainerId>container_1326232085508_0004_01_000003</assignedContainerId>
   <shuffleFinishTime>1326238780052</shuffleFinishTime>

Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm?rev=1295342&r1=1295341&r2=1295342&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm
Wed Feb 29 23:47:49 2012
@@ -116,7 +116,7 @@ NodeManager REST API's.
       "totalPmemAllocatedContainersMB" : 8192,
       "nodeManagerVersionBuiltOn" : "Mon Jan  9 15:01:59 UTC 2012",
       "nodeManagerVersion" : "0.23.1-SNAPSHOT",
-      "id" : "host.domain.com:45454",
+      "id" : "host.domain.com:8041",
       "hadoopBuildVersion" : "0.23.1-SNAPSHOT from 1228292 by user1 source checksum 3eba233f2248a089e9b28841a784dd00",
       "nodeHostName" : "host.domain.com",
       "hadoopVersion" : "0.23.1-SNAPSHOT"
@@ -158,7 +158,7 @@ NodeManager REST API's.
   <hadoopVersion>0.23.1-SNAPSHOT</hadoopVersion>
   <hadoopBuildVersion>0.23.1-SNAPSHOT from 1228292 by user1 source checksum 3eba233f2248a089e9b28841a784dd00</hadoopBuildVersion>
   <hadoopVersionBuiltOn>Mon Jan  9 14:58:42 UTC 2012</hadoopVersionBuiltOn>
-  <id>host.domain.com:45454</id>
+  <id>host.domain.com:8041</id>
   <nodeHostName>host.domain.com</nodeHostName>
 </nodeInfo>
 +---+
@@ -446,21 +446,21 @@ NodeManager REST API's.
    "containers" : {
       "container" : [
          {
-            "nodeId" : "host.domain.com:45454",
+            "nodeId" : "host.domain.com:8041",
             "totalMemoryNeededMB" : 2048,
             "state" : "RUNNING",
             "diagnostics" : "",
-            "containerLogsLink" : "http://host.domain.com:9999/node/containerlogs/container_1326121700862_0006_01_000001/user1",
+            "containerLogsLink" : "http://host.domain.com:8042/node/containerlogs/container_1326121700862_0006_01_000001/user1",
             "user" : "user1",
             "id" : "container_1326121700862_0006_01_000001",
             "exitCode" : -1000
          },
          {
-            "nodeId" : "host.domain.com:45454",
+            "nodeId" : "host.domain.com:8041",
             "totalMemoryNeededMB" : 2048,
             "state" : "RUNNING",
             "diagnostics" : "",
-            "containerLogsLink" : "http://host.domain.com:9999/node/containerlogs/container_1326121700862_0006_01_000003/user1",
+            "containerLogsLink" : "http://host.domain.com:8042/node/containerlogs/container_1326121700862_0006_01_000003/user1",
             "user" : "user1",
             "id" : "container_1326121700862_0006_01_000003",
             "exitCode" : -1000
@@ -500,8 +500,8 @@ NodeManager REST API's.
     <diagnostics/>
     <user>user1</user>
     <totalMemoryNeededMB>2048</totalMemoryNeededMB>
-    <containerLogsLink>http://host.domain.com:9999/node/containerlogs/container_1326121700862_0006_01_000001/user1</containerLogsLink>
-    <nodeId>host.domain.com:45454</nodeId>
+    <containerLogsLink>http://host.domain.com:8042/node/containerlogs/container_1326121700862_0006_01_000001/user1</containerLogsLink>
+    <nodeId>host.domain.com:8041</nodeId>
   </container>
   <container>
     <id>container_1326121700862_0006_01_000003</id>
@@ -510,8 +510,8 @@ NodeManager REST API's.
     <diagnostics>Container killed by the ApplicationMaster.</diagnostics>
     <user>user1</user>
     <totalMemoryNeededMB>2048</totalMemoryNeededMB>
-    <containerLogsLink>http://host.domain.com:9999/node/containerlogs/container_1326121700862_0006_01_000003/user1</containerLogsLink>
-    <nodeId>host.domain.com:45454</nodeId>
+    <containerLogsLink>http://host.domain.com:8042/node/containerlogs/container_1326121700862_0006_01_000003/user1</containerLogsLink>
+    <nodeId>host.domain.com:8041</nodeId>
   </container>
 </containers>
 +---+
@@ -587,11 +587,11 @@ NodeManager REST API's.
 +---+
 {
    "container" : {
-      "nodeId" : "host.domain.com:45454",
+      "nodeId" : "host.domain.com:8041",
       "totalMemoryNeededMB" : 2048,
       "state" : "RUNNING",
       "diagnostics" : "",
-      "containerLogsLink" : "http://host.domain.com:9999/node/containerlogs/container_1326121700862_0007_01_000001/user1",
+      "containerLogsLink" : "http://host.domain.com:8042/node/containerlogs/container_1326121700862_0007_01_000001/user1",
       "user" : "user1",
       "id" : "container_1326121700862_0007_01_000001",
       "exitCode" : -1000
@@ -628,8 +628,8 @@ NodeManager REST API's.
   <diagnostics/>
   <user>user1</user>
   <totalMemoryNeededMB>2048</totalMemoryNeededMB>
-  <containerLogsLink>http://host.domain.com:9999/node/containerlogs/container_1326121700862_0007_01_000001/user1</containerLogsLink>
-  <nodeId>host.domain.com:45454</nodeId>
+  <containerLogsLink>http://host.domain.com:8042/node/containerlogs/container_1326121700862_0007_01_000001/user1</containerLogsLink>
+  <nodeId>host.domain.com:8041</nodeId>
 </container>
 +---+
 

Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm?rev=1295342&r1=1295341&r2=1295342&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
Wed Feb 29 23:47:49 2012
@@ -313,11 +313,11 @@ ResourceManager REST API's.
 *---------------+--------------+-------------------------------+
 | type | string | Scheduler type - capacityScheduler|
 *---------------+--------------+-------------------------------+
-| capacity | float | Queue capacity in percentage relative to its parent queue |
+| capacity | float | Configured queue capacity in percentage relative to its parent queue
|
 *---------------+--------------+-------------------------------+
-| usedCapacity | float | Used queue capacity in percentage relative its to parent queue |
+| usedCapacity | float | Used queue capacity in percentage |
 *---------------+--------------+-------------------------------+
-| maxCapacity | float | Maximum queue capacity in percentage relative to its parent queue
|
+| maxCapacity | float | Configured maximum queue capacity in percentage relative to its parent
queue|
 *---------------+--------------+-------------------------------+
 | queueName | string | Name of the queue |
 *---------------+--------------+-------------------------------+
@@ -329,17 +329,17 @@ ResourceManager REST API's.
 *---------------+--------------+-------------------------------+
 || Item         || Data Type   || Description                   |
 *---------------+--------------+-------------------------------+
-| capacity | float | Queue capacity in percentage relative to its parent queue |
+| capacity | float | Configured queue capacity in percentage relative to its parent queue
|
 *---------------+--------------+-------------------------------+
-| usedCapacity | float | Used queue capacity in percentage relative its to parent queue |
+| usedCapacity | float | Used queue capacity in percentage |
 *---------------+--------------+-------------------------------+
-| maxCapacity | float | Maximum queue capacity in percentage relative to its parent queue
|
+| maxCapacity | float | Configured maximum queue capacity in percentage relative to its parent
queue |
 *---------------+--------------+-------------------------------+
 | absoluteCapacity | float | Absolute capacity percentage this queue can use of entire cluster
| 
 *---------------+--------------+-------------------------------+
 | absoluteMaxCapacity | float | Absolute maximum capacity percentage this queue can use of
the entire cluster | 
 *---------------+--------------+-------------------------------+
-| utilization | float | Queue utilization percentage relative to the entire cluster |
+| absoluteUsedCapacity | float | Absolute used capacity percentage this queue is using of
the entire cluster |
 *---------------+--------------+-------------------------------+
 | numApplications | int | The number of applications currently in the queue |
 *---------------+--------------+-------------------------------+
@@ -421,7 +421,7 @@ ResourceManager REST API's.
                "absoluteMaxCapacity" : 90,
                "maxActiveApplications" : 1,
                "numActiveApplications" : 0,
-               "utilization" : 0,
+               "absoluteUsedCapacity" : 0,
                "userLimit" : 100,
                "absoluteCapacity" : 70,
                "maxActiveApplicationsPerUser" : 1,
@@ -431,7 +431,7 @@ ResourceManager REST API's.
             },
             {
                "queueName" : "test",
-               "utilization" : 0,
+               "absoluteUsedCapacity" : 0,
                "absoluteCapacity" : 20,
                "usedCapacity" : 0,
                "capacity" : 20,
@@ -450,7 +450,7 @@ ResourceManager REST API's.
                      "absoluteMaxCapacity" : 16.000002,
                      "maxActiveApplications" : 1,
                      "numActiveApplications" : 0,
-                     "utilization" : 0,
+                     "absoluteUsedCapacity" : 0,
                      "userLimit" : 100,
                      "absoluteCapacity" : 12,
                      "maxActiveApplicationsPerUser" : 1,
@@ -472,7 +472,7 @@ ResourceManager REST API's.
                      "absoluteMaxCapacity" : 100,
                      "maxActiveApplications" : 1,
                      "numActiveApplications" : 0,
-                     "utilization" : 0,
+                     "absoluteUsedCapacity" : 0,
                      "userLimit" : 100,
                      "absoluteCapacity" : 8.000001,
                      "maxActiveApplicationsPerUser" : 1,
@@ -489,7 +489,7 @@ ResourceManager REST API's.
             },
             {
                "queueName" : "test2",
-               "utilization" : 0,
+               "absoluteUsedCapacity" : 0,
                "absoluteCapacity" : 10,
                "usedCapacity" : 0,
                "capacity" : 10,
@@ -508,7 +508,7 @@ ResourceManager REST API's.
                      "absoluteMaxCapacity" : 100,
                      "maxActiveApplications" : 1,
                      "numActiveApplications" : 0,
-                     "utilization" : 0,
+                     "absoluteUsedCapacity" : 0,
                      "userLimit" : 100,
                      "absoluteCapacity" : 5,
                      "maxActiveApplicationsPerUser" : 1,
@@ -530,7 +530,7 @@ ResourceManager REST API's.
                      "absoluteMaxCapacity" : 100,
                      "maxActiveApplications" : 1,
                      "numActiveApplications" : 0,
-                     "utilization" : 0,
+                     "absoluteUsedCapacity" : 0,
                      "userLimit" : 100,
                      "absoluteCapacity" : 4.0000005,
                      "maxActiveApplicationsPerUser" : 1,
@@ -552,7 +552,7 @@ ResourceManager REST API's.
                      "absoluteMaxCapacity" : 100,
                      "maxActiveApplications" : 1,
                      "numActiveApplications" : 0,
-                     "utilization" : 0,
+                     "absoluteUsedCapacity" : 0,
                      "userLimit" : 100,
                      "absoluteCapacity" : 1.0000001,
                      "maxActiveApplicationsPerUser" : 1,
@@ -609,7 +609,7 @@ ResourceManager REST API's.
       <maxCapacity>90.0</maxCapacity>
       <absoluteCapacity>70.0</absoluteCapacity>
       <absoluteMaxCapacity>90.0</absoluteMaxCapacity>
-      <utilization>0.0</utilization>
+      <absoluteUsedCapacity>0.0</absoluteUsedCapacity>
       <numApplications>0</numApplications>
       <usedResources>memory: 0</usedResources>
       <queueName>default</queueName>
@@ -630,7 +630,7 @@ ResourceManager REST API's.
       <maxCapacity>80.0</maxCapacity>
       <absoluteCapacity>20.0</absoluteCapacity>
       <absoluteMaxCapacity>80.0</absoluteMaxCapacity>
-      <utilization>0.0</utilization>
+      <absoluteUsedCapacity>0.0</absoluteUsedCapacity>
       <numApplications>0</numApplications>
       <usedResources>memory: 0</usedResources>
       <queueName>test</queueName>
@@ -641,7 +641,7 @@ ResourceManager REST API's.
         <maxCapacity>80.0</maxCapacity>
         <absoluteCapacity>12.0</absoluteCapacity>
         <absoluteMaxCapacity>16.000002</absoluteMaxCapacity>
-        <utilization>0.0</utilization>
+        <absoluteUsedCapacity>0.0</absoluteUsedCapacity>
         <numApplications>0</numApplications>
         <usedResources>memory: 0</usedResources>
         <queueName>a1</queueName>
@@ -662,7 +662,7 @@ ResourceManager REST API's.
         <maxCapacity>100.0</maxCapacity>
         <absoluteCapacity>8.000001</absoluteCapacity>
         <absoluteMaxCapacity>100.0</absoluteMaxCapacity>
-        <utilization>0.0</utilization>
+        <absoluteUsedCapacity>0.0</absoluteUsedCapacity>
         <numApplications>0</numApplications>
         <usedResources>memory: 0</usedResources>
         <queueName>a2</queueName>
@@ -684,7 +684,7 @@ ResourceManager REST API's.
       <maxCapacity>15.000001</maxCapacity>
       <absoluteCapacity>10.0</absoluteCapacity>
       <absoluteMaxCapacity>15.000001</absoluteMaxCapacity>
-      <utilization>0.0</utilization>
+      <absoluteUsedCapacity>0.0</absoluteUsedCapacity>
       <numApplications>0</numApplications>
       <usedResources>memory: 0</usedResources>
      <queueName>test2</queueName>
@@ -695,7 +695,7 @@ ResourceManager REST API's.
         <maxCapacity>100.0</maxCapacity>
         <absoluteCapacity>5.0</absoluteCapacity>
         <absoluteMaxCapacity>100.0</absoluteMaxCapacity>
-        <utilization>0.0</utilization>
+        <absoluteUsedCapacity>0.0</absoluteUsedCapacity>
         <numApplications>0</numApplications>
         <usedResources>memory: 0</usedResources>
         <queueName>A4</queueName>
@@ -716,7 +716,7 @@ ResourceManager REST API's.
         <maxCapacity>100.0</maxCapacity>
         <absoluteCapacity>4.0000005</absoluteCapacity>
         <absoluteMaxCapacity>100.0</absoluteMaxCapacity>
-        <utilization>0.0</utilization>
+        <absoluteUsedCapacity>0.0</absoluteUsedCapacity>
         <numApplications>0</numApplications>
         <usedResources>memory: 0</usedResources>
         <queueName>a3</queueName>
@@ -737,7 +737,7 @@ ResourceManager REST API's.
         <maxCapacity>100.0</maxCapacity>
         <absoluteCapacity>1.0000001</absoluteCapacity>
         <absoluteMaxCapacity>100.0</absoluteMaxCapacity>
-        <utilization>0.0</utilization>
+        <absoluteUsedCapacity>0.0</absoluteUsedCapacity>
         <numApplications>0</numApplications>
         <usedResources>memory: 0</usedResources>
         <queueName>a4</queueName>
@@ -939,14 +939,14 @@ ResourceManager REST API's.
     [
        {
           "finishedTime" : 1326815598530,
-          "amContainerLogs" : "http://host.domain.com:9999/node/containerlogs/container_1326815542473_0001_01_000001",
+          "amContainerLogs" : "http://host.domain.com:8042/node/containerlogs/container_1326815542473_0001_01_000001",
           "trackingUI" : "History",
           "state" : "FINISHED",
           "user" : "user1",
           "id" : "application_1326815542473_0001",
           "clusterId" : 1326815542473,
           "finalStatus" : "SUCCEEDED",
-          "amHostHttpAddress" : "host.domain.com:9999",
+          "amHostHttpAddress" : "host.domain.com:8042",
           "progress" : 100,
           "name" : "word count",
           "startedTime" : 1326815573334,
@@ -957,14 +957,14 @@ ResourceManager REST API's.
        },
        {
           "finishedTime" : 1326815789546,
-          "amContainerLogs" : "http://host.domain.com:9999/node/containerlogs/container_1326815542473_0002_01_000001",
+          "amContainerLogs" : "http://host.domain.com:8042/node/containerlogs/container_1326815542473_0002_01_000001",
           "trackingUI" : "History",
           "state" : "FINISHED",
           "user" : "user1",
           "id" : "application_1326815542473_0002",
           "clusterId" : 1326815542473,
           "finalStatus" : "SUCCEEDED",
-          "amHostHttpAddress" : "host.domain.com:9999",
+          "amHostHttpAddress" : "host.domain.com:8042",
           "progress" : 100,
           "name" : "Sleep job",
           "startedTime" : 1326815641380,
@@ -1017,9 +1017,9 @@ ResourceManager REST API's.
     <startedTime>1326815573334</startedTime>
     <finishedTime>1326815598530</finishedTime>
     <elapsedTime>25196</elapsedTime>
-    <amContainerLogs>http://host.domain.com:9999/node/containerlogs/container_1326815542473_0001
+    <amContainerLogs>http://host.domain.com:8042/node/containerlogs/container_1326815542473_0001
 _01_000001</amContainerLogs>
-    <amHostHttpAddress>host.domain.com:9999</amHostHttpAddress>
+    <amHostHttpAddress>host.domain.com:8042</amHostHttpAddress>
   </app>
   <app>
     <id>application_1326815542473_0002</id>
@@ -1036,8 +1036,8 @@ _01_000001</amContainerLogs>
     <startedTime>1326815641380</startedTime>
     <finishedTime>1326815789546</finishedTime>
     <elapsedTime>148166</elapsedTime>
-    <amContainerLogs>http://host.domain.com:9999/node/containerlogs/container_1326815542473_0002_01_000001</amContainerLogs>
-    <amHostHttpAddress>host.domain.com:9999</amHostHttpAddress>
+    <amContainerLogs>http://host.domain.com:8042/node/containerlogs/container_1326815542473_0002_01_000001</amContainerLogs>
+    <amHostHttpAddress>host.domain.com:8042</amHostHttpAddress>
   </app>
 </apps>
 
@@ -1132,14 +1132,14 @@ _01_000001</amContainerLogs>
 {
    "app" : {
       "finishedTime" : 1326824991300,
-      "amContainerLogs" : "http://host.domain.com:9999/node/containerlogs/container_1326821518301_0005_01_000001",
+      "amContainerLogs" : "http://host.domain.com:8042/node/containerlogs/container_1326821518301_0005_01_000001",
       "trackingUI" : "History",
       "state" : "FINISHED",
       "user" : "user1",
       "id" : "application_1326821518301_0005",
       "clusterId" : 1326821518301,
       "finalStatus" : "SUCCEEDED",
-      "amHostHttpAddress" : "host.domain.com:9999",
+      "amHostHttpAddress" : "host.domain.com:8042",
       "progress" : 100,
       "name" : "Sleep job",
       "startedTime" : 1326824544552,
@@ -1188,8 +1188,8 @@ _01_000001</amContainerLogs>
   <startedTime>1326824544552</startedTime>
   <finishedTime>1326824991300</finishedTime>
   <elapsedTime>446748</elapsedTime>
-  <amContainerLogs>http://host.domain.com:9999/node/containerlogs/container_1326821518301_0005_01_000001</amContainerLogs>
-  <amHostHttpAddress>host.domain.com:9999</amHostHttpAddress>
+  <amContainerLogs>http://host.domain.com:8042/node/containerlogs/container_1326821518301_0005_01_000001</amContainerLogs>
+  <amHostHttpAddress>host.domain.com:8042</amHostHttpAddress>
 </app>
 +---+
 

Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm?rev=1295342&r1=1295341&r2=1295342&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm
Wed Feb 29 23:47:49 2012
@@ -182,7 +182,7 @@ Note that the order of the fields within
   The client prints information about the job submitted along with the application id, similar
to:
 
 +---+
-12/01/18 04:25:15 INFO mapred.ResourceMgrDelegate: Submitted application application_1326821518301_0010
to ResourceManager at host.domain.com/10.10.10.10:8040
+12/01/18 04:25:15 INFO mapred.ResourceMgrDelegate: Submitted application application_1326821518301_0010
to ResourceManager at host.domain.com/10.10.10.10:8032
 12/01/18 04:25:15 INFO mapreduce.Job: Running job: job_1326821518301_0010
 12/01/18 04:25:21 INFO mapred.ClientServiceDelegate: The url to track the job: host.domain.com:8088/proxy/application_1326821518301_0010/
 12/01/18 04:25:22 INFO mapreduce.Job: Job job_1326821518301_0010 running in uber mode : false
@@ -201,14 +201,14 @@ curl --compressed -H "Accept: applicatio
 {
    "app" : {
       "finishedTime" : 0,
-      "amContainerLogs" : "http://host.domain.com:9999/node/containerlogs/container_1326821518301_0010_01_000001",
+      "amContainerLogs" : "http://host.domain.com:8042/node/containerlogs/container_1326821518301_0010_01_000001",
       "trackingUI" : "ApplicationMaster",
       "state" : "RUNNING",
       "user" : "user1",
       "id" : "application_1326821518301_0010",
       "clusterId" : 1326821518301,
       "finalStatus" : "UNDEFINED",
-      "amHostHttpAddress" : "host.domain.com:9999",
+      "amHostHttpAddress" : "host.domain.com:8042",
       "progress" : 82.44703,
       "name" : "Sleep job",
       "startedTime" : 1326860715335,
@@ -338,7 +338,7 @@ curl --compressed -H "Accept: applicatio
             "mergeFinishTime" : 1326860735536,
             "rack" : "/10.10.10.0",
             "elapsedReduceTime" : 0,
-            "nodeHttpAddress" : "host.domain.com:9999",
+            "nodeHttpAddress" : "host.domain.com:8042",
             "type" : "REDUCE",
             "startTime" : 1326860732984,
             "id" : "attempt_1326821518301_10_10_r_0_0",
@@ -575,14 +575,14 @@ curl --compressed -H "Accept: applicatio
 {
    "app" : {
       "finishedTime" : 1326861991282,
-      "amContainerLogs" : "http://host.domain.com:9999/node/containerlogs/container_1326821518301_0010_01_000001",
+      "amContainerLogs" : "http://host.domain.com:8042/node/containerlogs/container_1326821518301_0010_01_000001",
       "trackingUI" : "History",
       "state" : "FINISHED",
       "user" : "user1",
       "id" : "application_1326821518301_0010",
       "clusterId" : 1326821518301,
       "finalStatus" : "SUCCEEDED",
-      "amHostHttpAddress" : "host.domain.com:9999",
+      "amHostHttpAddress" : "host.domain.com:8042",
       "progress" : 100,
       "name" : "Sleep job",
       "startedTime" : 1326860715335,

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/c++/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/c++:1159757-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/c++:1159757-1295332
 /hadoop/core/branches/branch-0.19/mapred/src/c++:713112
 /hadoop/core/trunk/src/c++:776175-784663

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib:1152502-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib:1152502-1295332
 /hadoop/core/branches/branch-0.19/mapred/src/contrib:713112
 /hadoop/core/trunk/src/contrib:784664-785643

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/block_forensics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/block_forensics:1152502-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/block_forensics:1152502-1295332
 /hadoop/core/branches/branch-0.19/hdfs/src/contrib/block_forensics:713112
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/block_forensics:713112
 /hadoop/core/trunk/src/contrib/block_forensics:784664-785643

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build-contrib.xml:1161333-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build-contrib.xml:1161333-1295332
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/build-contrib.xml:713112
 /hadoop/core/trunk/src/contrib/build-contrib.xml:776175-786373

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build.xml:1161333-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build.xml:1161333-1295332
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/build.xml:713112
 /hadoop/core/trunk/src/contrib/build.xml:776175-786373

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/data_join/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join:1159757-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join:1159757-1295332
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/data_join:713112
 /hadoop/core/trunk/src/contrib/data_join:776175-786373

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/eclipse-plugin:1159757-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/eclipse-plugin:1159757-1295332
 /hadoop/core/branches/branch-0.19/core/src/contrib/eclipse-plugin:713112
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/eclipse-plugin:713112
 /hadoop/core/trunk/src/contrib/eclipse-plugin:776175-785643

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/index:1159757-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/index:1159757-1295332
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/index:713112
 /hadoop/core/trunk/src/contrib/index:776175-786373

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/vaidya/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/vaidya:1159757-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/vaidya:1159757-1295332
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/vaidya:713112
 /hadoop/core/trunk/src/contrib/vaidya:776175-786373

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/examples:1152502-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/examples:1152502-1295332
 /hadoop/core/branches/branch-0.19/mapred/src/examples:713112
 /hadoop/core/trunk/src/examples:776175-784663

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/java:1152502-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/java:1152502-1295332
 /hadoop/core/branches/branch-0.19/mapred/src/java:713112
 /hadoop/core/trunk/src/mapred:776175-785643

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred:1152502-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred:1152502-1295332
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred:713112
 /hadoop/core/trunk/src/test/mapred:776175-785643

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs:1159757-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs:1159757-1295332
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/fs:713112
 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/fs:776175-785643
 /hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs:1152502-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs:1152502-1295332
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/hdfs:713112
 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/hdfs:776175-785643
 /hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc:1159757-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc:1159757-1295332
 /hadoop/core/branches/branch-0.19/hdfs/src/test/hdfs-with-mr/org/apache/hadoop/ipc:713112
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/ipc:713112
 /hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/ipc:776175-784663

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 23:47:49 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job:1152502-1294758
+/hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job:1152502-1295332
 /hadoop/core/branches/branch-0.19/mapred/src/webapps/job:713112
 /hadoop/core/trunk/src/webapps/job:776175-785643



Mime
View raw message