This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 23b470e HADOOP-16443. Improve help text for setfacl --set option.
23b470e is described below
commit 23b470ee928237ce1da76f4b8cb16a55d4ff679d
Author: S O'Donnell <[email protected]>
AuthorDate: Mon Jul 22 16:49:10 2019 +0100
HADOOP-16443. Improve help text for setfacl --set option.
Contributed by S O'Donnell.
Change-Id: I1da46c4c414a5d2b07ee15867508f0799440a413
---
.../src/main/java/org/apache/hadoop/fs/shell/AclCommands.java | 6 +++++-
.../hadoop-common/src/site/markdown/FileSystemShell.md | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java
index 701c9de..5a60ef2 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java
@@ -173,7 +173,11 @@ class AclCommands extends FsCommand {
+ " -x :Remove specified ACL entries. Other ACL entries are
retained.\n"
+ " --set :Fully replace the ACL, discarding all existing entries."
+ " The <acl_spec> must include entries for user, group, and others"
- + " for compatibility with permission bits.\n"
+ + " for compatibility with permission bits. If the ACL spec contains"
+ + " only access entries, then the existing default entries are
retained"
+ + ". If the ACL spec contains only default entries, then the existing"
+ + " access entries are retained. If the ACL spec contains both access"
+ + " and default entries, then both are replaced.\n"
+ " <acl_spec>: Comma separated list of ACL entries.\n"
+ " <path>: File or directory to modify.\n";
diff --git
a/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
b/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
index f4a37ea..22dfb39 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
@@ -625,7 +625,7 @@ Options:
* -R: Apply operations to all files and directories recursively.
* -m: Modify ACL. New entries are added to the ACL, and existing entries are
retained.
* -x: Remove specified ACL entries. Other ACL entries are retained.
-* ``--set``: Fully replace the ACL, discarding all existing entries. The
*acl\_spec* must include entries for user, group, and others for compatibility
with permission bits.
+* ``--set``: Fully replace the ACL, discarding all existing entries. The
*acl\_spec* must include entries for user, group, and others for compatibility
with permission bits. If the ACL spec contains only access entries, then the
existing default entries are retained. If the ACL spec contains only default
entries, then the existing access entries are retained. If the ACL spec
contains both access and default entries, then both are replaced.
* *acl\_spec*: Comma separated list of ACL entries.
* *path*: File or directory to modify.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
