big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some merge errors that slipped through.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615013 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Wang 2014-07-31 22:45:08 +00:00
parent ab47b666d0
commit beebb36595
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java
View File

@ -1336,28 +1336,11 @@ public List<XAttr> listXAttrs(String src)
/**
* Remove xattr of a file or directory.Value in xAttr parameter is ignored.
<<<<<<< .working
* Name must be prefixed with user/trusted/security/system/raw.
=======
* The name must be prefixed with the namespace followed by ".". For example,
* "user.attr".
>>>>>>> .merge-right.r1614550
* <p/>
<<<<<<< .working
* A regular user only can remove xattr of "user" namespace.
* A super user can remove xattr of "user" and "trusted" namespace.
* XAttr of "security" and "system" namespace is only used/exposed
* internally to the FS impl.
* The xattrs of the "raw" namespace are only used/exposed when accessed in
* the /.reserved/raw HDFS directory hierarchy. These attributes can only be
* accessed by the superuser.
* <p/>
* @see <a href="http://en.wikipedia.org/wiki/Extended_file_attributes">
* http://en.wikipedia.org/wiki/Extended_file_attributes</a>
=======
* Refer to the HDFS extended attributes user documentation for details.
*
>>>>>>> .merge-right.r1614550
* @param src file or directory
* @param xAttr <code>XAttr</code> to remove
* @throws IOException