Author: vinodkv
Date: Sat Oct 5 05:15:22 2013
New Revision: 1529387
URL: http://svn.apache.org/r1529387
Log:
YARN-1271. Addendum patch to remove unused method in ContainerExecutor.
Contributed by Sandy Ryza.
svn merge --ignore-ancestry -c 1529386 ../branch-2
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/ContainerExecutor.java
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/ContainerExecutor.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/ContainerExecutor.java?rev=1529387&r1=1529386&r2=1529387&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/ContainerExecutor.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/ContainerExecutor.java
Sat Oct 5 05:15:22 2013
@@ -189,20 +189,6 @@ public abstract class ContainerExecutor
}
}
- /** Return a command to execute the given command in OS shell.
- * On Windows, the passed in groupId can be used to launch
- * and associate the given groupId in a process group. On
- * non-Windows, groupId is ignored. */
- protected static String[] getRunCommand(String command,
- String groupId) {
- if (Shell.WINDOWS) {
- return new String[] { Shell.WINUTILS, "task", "create", groupId,
- "cmd /c " + command };
- } else {
- return new String[] { "bash", "-c", command };
- }
- }
-
/**
* Return a command to execute the given command in OS shell.
* On Windows, the passed in groupId can be used to launch
