You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by br...@apache.org on 2017/05/11 18:12:22 UTC
[2/2] hadoop git commit: HADOOP-14410. Correct spelling of
'beginning' and variants. Contributed By Dongtao Zhang
HADOOP-14410. Correct spelling of 'beginning' and variants. Contributed By Dongtao Zhang
(cherry picked from commit 4aae2d40a3e2e732e09b4b8a82623cacc0dc8861)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3766e548
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3766e548
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3766e548
Branch: refs/heads/branch-2
Commit: 3766e548931e3e6b464b235d6af6ad09da39c445
Parents: 5ef3f97
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Thu May 11 23:33:45 2017 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Thu May 11 23:38:18 2017 +0530
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java | 2 +-
.../src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java | 2 +-
.../apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.java | 2 +-
.../hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java | 2 +-
.../monitor/capacity/QueuePriorityContainerCandidateSelector.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3766e548/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java
index 943846d..5eeff15 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java
@@ -134,7 +134,7 @@ class ChRootedFileSystem extends FilterFileSystem {
/**
* Strip out the root from the path.
* @param p - fully qualified path p
- * @return - the remaining path without the begining /
+ * @return - the remaining path without the beginning /
* @throws IOException if the p is not prefixed with root
*/
String stripOutRoot(final Path p) throws IOException {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3766e548/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java
index ad1f5b5..6168df0 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java
@@ -132,7 +132,7 @@ class ChRootedFs extends AbstractFileSystem {
* Strip out the root from the path.
*
* @param p - fully qualified path p
- * @return - the remaining path without the begining /
+ * @return - the remaining path without the beginning /
*/
public String stripOutRoot(final Path p) {
try {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3766e548/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.java
index fc3c4a7..ff4ab98 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.java
@@ -112,7 +112,7 @@ public class JniBasedUnixGroupsNetgroupMapping
protected synchronized List<String> getUsersForNetgroup(String netgroup) {
String[] users = null;
try {
- // JNI code does not expect '@' at the begining of the group name
+ // JNI code does not expect '@' at the beginning of the group name
users = getUsersForNetgroupJNI(netgroup.substring(1));
} catch (Exception e) {
if (LOG.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3766e548/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java
index 0ee1c60..4aa4e9f 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java
@@ -133,7 +133,7 @@ public class ShellBasedUnixGroupsNetgroupMapping
throws IOException {
String result = "";
try {
- // shell command does not expect '@' at the begining of the group name
+ // shell command does not expect '@' at the beginning of the group name
result = Shell.execCommand(
Shell.getUsersForNetgroupCommand(netgroup.substring(1)));
} catch (ExitCodeException e) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3766e548/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java
index 3771388..5f9f1eb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java
@@ -426,7 +426,7 @@ public class QueuePriorityContainerCandidateSelector
long currentTime = System.currentTimeMillis();
- // From the begining of the list
+ // From the beginning of the list
for (RMContainer reservedContainer : reservedContainers) {
// Only try to preempt reserved container after reserved container created
// and cannot be allocated after minTimeout
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org